diff options
| author | Jeff Layton <jlayton@kernel.org> | 2024-01-31 18:01:58 -0500 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2024-02-05 13:11:38 +0100 |
| commit | a69ce85ec9af6bdc0b3511959a7dc1a324e5e16a (patch) | |
| tree | 4df18a2921afb3ad3a002210fad2f84a32fa2425 /fs/smb | |
| parent | 3d40f78169a0a954ff06e2b0f8e21463f7edb433 (diff) | |
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 'fs/smb')
| -rw-r--r-- | fs/smb/client/cifsglob.h | 1 | ||||
| -rw-r--r-- | fs/smb/client/cifssmb.c | 1 | ||||
| -rw-r--r-- | fs/smb/client/file.c | 3 | ||||
| -rw-r--r-- | fs/smb/client/smb2file.c | 1 | ||||
| -rw-r--r-- | fs/smb/server/smb2pdu.c | 1 | ||||
| -rw-r--r-- | fs/smb/server/vfs.c | 1 |
6 files changed, 7 insertions, 1 deletions
diff --git a/fs/smb/client/cifsglob.h b/fs/smb/client/cifsglob.h index 20036fb16cec..fcda4c77c649 100644 --- a/fs/smb/client/cifsglob.h +++ b/fs/smb/client/cifsglob.h @@ -26,6 +26,7 @@ #include <uapi/linux/cifs/cifs_mount.h> #include "../common/smb2pdu.h" #include "smb2pdu.h" +#define _NEED_FILE_LOCK_FIELD_MACROS #include <linux/filelock.h> #define SMB_PATH_MAX 260 diff --git a/fs/smb/client/cifssmb.c b/fs/smb/client/cifssmb.c index 01e89070df5a..e19ecf692c20 100644 --- a/fs/smb/client/cifssmb.c +++ b/fs/smb/client/cifssmb.c @@ -15,6 +15,7 @@ /* want to reuse a stale file handle and only the caller knows the file info */ #include <linux/fs.h> +#define _NEED_FILE_LOCK_FIELD_MACROS #include <linux/filelock.h> #include <linux/kernel.h> #include <linux/vfs.h> diff --git a/fs/smb/client/file.c b/fs/smb/client/file.c index c26f8ed14065..d3f5969c3a86 100644 --- a/fs/smb/client/file.c +++ b/fs/smb/client/file.c @@ -9,6 +9,7 @@ * */ #include <linux/fs.h> +#define _NEED_FILE_LOCK_FIELD_MACROS #include <linux/filelock.h> #include <linux/backing-dev.h> #include <linux/stat.h> @@ -2951,7 +2952,7 @@ skip_write: continue; } - folio_batch_release(&fbatch); + folio_batch_release(&fbatch); cond_resched(); } while (wbc->nr_to_write > 0); diff --git a/fs/smb/client/smb2file.c b/fs/smb/client/smb2file.c index e0ee96d69d49..cd225d15a7c5 100644 --- a/fs/smb/client/smb2file.c +++ b/fs/smb/client/smb2file.c @@ -7,6 +7,7 @@ * */ #include <linux/fs.h> +#define _NEED_FILE_LOCK_FIELD_MACROS #include <linux/filelock.h> #include <linux/stat.h> #include <linux/slab.h> diff --git a/fs/smb/server/smb2pdu.c b/fs/smb/server/smb2pdu.c index e170b96d5ac0..11cc28719582 100644 --- a/fs/smb/server/smb2pdu.c +++ b/fs/smb/server/smb2pdu.c @@ -12,6 +12,7 @@ #include <linux/ethtool.h> #include <linux/falloc.h> #include <linux/mount.h> +#define _NEED_FILE_LOCK_FIELD_MACROS #include <linux/filelock.h> #include "glob.h" diff --git a/fs/smb/server/vfs.c b/fs/smb/server/vfs.c index 449cfa9ed31c..5dc87649400b 100644 --- a/fs/smb/server/vfs.c +++ b/fs/smb/server/vfs.c @@ -6,6 +6,7 @@ #include <linux/kernel.h> #include <linux/fs.h> +#define _NEED_FILE_LOCK_FIELD_MACROS #include <linux/filelock.h> #include <linux/uaccess.h> #include <linux/backing-dev.h> |