diff options
| author | Jeff Layton <jlayton@kernel.org> | 2024-02-01 02:01:58 +0300 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2024-02-05 15:11:38 +0300 |
| commit | a69ce85ec9af6bdc0b3511959a7dc1a324e5e16a (patch) | |
| tree | 4df18a2921afb3ad3a002210fad2f84a32fa2425 /include/linux/lockd | |
| parent | 3d40f78169a0a954ff06e2b0f8e21463f7edb433 (diff) | |
| download | linux-a69ce85ec9af6bdc0b3511959a7dc1a324e5e16a.tar.xz | |
filelock: split common fields into struct file_lock_core
In a future patch, we're going to split file leases into their own
structure. Since a lot of the underlying machinery uses the same fields
move those into a new file_lock_core, and embed that inside struct
file_lock.
For now, add some macros to ensure that we can continue to build while
the conversion is in progress.
Signed-off-by: Jeff Layton <jlayton@kernel.org>
Link: https://lore.kernel.org/r/20240131-flsplit-v3-17-c6129007ee8d@kernel.org
Reviewed-by: NeilBrown <neilb@suse.de>
Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'include/linux/lockd')
| -rw-r--r-- | include/linux/lockd/xdr.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/lockd/xdr.h b/include/linux/lockd/xdr.h index b60fbcd8cdfa..a3f068b0ca86 100644 --- a/include/linux/lockd/xdr.h +++ b/include/linux/lockd/xdr.h @@ -11,6 +11,7 @@ #define LOCKD_XDR_H #include <linux/fs.h> +#define _NEED_FILE_LOCK_FIELD_MACROS #include <linux/filelock.h> #include <linux/nfs.h> #include <linux/sunrpc/xdr.h> @@ -52,7 +53,7 @@ struct nlm_lock { * FreeBSD uses 16, Apple Mac OS X 10.3 uses 20. Therefore we set it to * 32 bytes. */ - + struct nlm_cookie { unsigned char data[NLM_MAXCOOKIELEN]; |