github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-12 16:18:45 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

lockd: Move share.h from include/linux/lockd/ to fs/lockd/

Browse Source 
The share.h header defines struct nlm_share and declares the DOS
share management functions used by the NLM server to implement
NLM_SHARE and NLM_UNSHARE operations. These interfaces are used
exclusively within the lockd subsystem. A git grep search confirms
no external code references them.

Relocating this header from include/linux/lockd/ to fs/lockd/
narrows the public API surface of the lockd module. Out-of-tree
code cannot depend on these internal interfaces after this change.
Future refactoring of the share management implementation thus
requires no consideration of external consumers.

Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
This commit is contained in:
Chuck Lever 2026-01-28 10:19:29 -05:00
parent f4d5f8caad
commit 4db2f8a016
6 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/linux/lockd/share.h → fs/lockd/share.h
View File

@ -1,14 +1,12 @@
/* SPDX-License-Identifier: GPL-2.0 */
/*
* linux/include/linux/lockd/share.h
*
* DOS share management for lockd.
*
* Copyright (C) 1996, Olaf Kirch <okir@monad.swb.de>
*/
#ifndef LINUX_LOCKD_SHARE_H
#define LINUX_LOCKD_SHARE_H
#ifndef _LOCKD_SHARE_H
#define _LOCKD_SHARE_H
/*
* DOS share for a specific file
@ -29,4 +27,4 @@ __be32 nlmsvc_unshare_file(struct nlm_host *, struct nlm_file *,
void nlmsvc_traverse_shares(struct nlm_host *, struct nlm_file *,
nlm_host_match_fn_t);
#endif /* LINUX_LOCKD_SHARE_H */
#endif /* _LOCKD_SHARE_H */

2
fs/lockd/svc4proc.c
View File

@ -11,9 +11,9 @@
#include <linux/types.h>
#include <linux/time.h>
#include <linux/lockd/lockd.h>
#include <linux/lockd/share.h>
#include <linux/sunrpc/svc_xprt.h>
#include "share.h"
#include "xdr4.h"
#define NLMDBG_FACILITY NLMDBG_CLIENT

3
fs/lockd/svcproc.c
View File

@ -11,9 +11,10 @@
#include <linux/types.h>
#include <linux/time.h>
#include <linux/lockd/lockd.h>
#include <linux/lockd/share.h>
#include <linux/sunrpc/svc_xprt.h>
#include "share.h"
#define NLMDBG_FACILITY NLMDBG_CLIENT
#ifdef CONFIG_LOCKD_V4

3
fs/lockd/svcshare.c
View File

@ -15,7 +15,8 @@
#include <linux/sunrpc/clnt.h>
#include <linux/sunrpc/svc.h>
#include <linux/lockd/lockd.h>
#include <linux/lockd/share.h>
#include "share.h"
static inline int
nlm_cmp_owner(struct nlm_share *share, struct xdr_netobj *oh)

3
fs/lockd/svcsubs.c
View File

@ -16,11 +16,12 @@
#include <linux/sunrpc/svc.h>
#include <linux/sunrpc/addr.h>
#include <linux/lockd/lockd.h>
#include <linux/lockd/share.h>
#include <linux/module.h>
#include <linux/mount.h>
#include <uapi/linux/nfs2.h>
#include "share.h"
#define NLMDBG_FACILITY NLMDBG_SVCSUBS

2
include/linux/lockd/lockd.h
View File

@ -155,6 +155,8 @@ struct nlm_rqst {
void * a_callback_data; /* sent to nlmclnt_operations callbacks */
};
struct nlm_share;
/*
* This struct describes a file held open by lockd on behalf of
* an NFS client.