Unverified Commit b875bd5b authored by Benjamin Coddington's avatar Benjamin Coddington Committed by Christian Brauner
Browse files

exportfs: Remove EXPORT_OP_ASYNC_LOCK 



Now that GFS2 and OCFS2 are signalling async ->lock() support with
FOP_ASYNC_LOCK and checks for support are converted, we can remove
EXPORT_OP_ASYNC_LOCK.

Signed-off-by: default avatarBenjamin Coddington <bcodding@redhat.com>
Link: https://lore.kernel.org/r/0a114db814fec3086f937ae3d44a086f13b8de26.1726083391.git.bcodding@redhat.com


Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent 7e64c5bc

Documentation/filesystems/nfs/exporting.rst

+0 −7
Original line number Diff line number Diff line
@@ -238,10 +238,3 @@ following flags are defined: 
    all of an inode's dirty data on last close. Exports that behave this

    way should set EXPORT_OP_FLUSH_ON_CLOSE so that NFSD knows to skip

    waiting for writeback when closing such files.
 


  EXPORT_OP_ASYNC_LOCK - Indicates a capable filesystem to do async lock

    requests from lockd. Only set EXPORT_OP_ASYNC_LOCK if the filesystem has

    it's own ->lock() functionality as core posix_lock_file() implementation

    has no async lock request handling yet. For more information about how to

    indicate an async lock request from a ->lock() file_operations struct, see

    fs/locks.c and comment for the function vfs_lock_file().

fs/gfs2/export.c

+0 −1
Original line number Diff line number Diff line
@@ -190,6 +190,5 @@ const struct export_operations gfs2_export_ops = { 
	.fh_to_parent = gfs2_fh_to_parent,

	.get_name = gfs2_get_name,

	.get_parent = gfs2_get_parent,

	.flags = EXPORT_OP_ASYNC_LOCK,

};

fs/ocfs2/export.c

+0 −1
Original line number Diff line number Diff line
@@ -280,5 +280,4 @@ const struct export_operations ocfs2_export_ops = { 
	.fh_to_dentry	= ocfs2_fh_to_dentry,

	.fh_to_parent	= ocfs2_fh_to_parent,

	.get_parent	= ocfs2_get_parent,

	.flags		= EXPORT_OP_ASYNC_LOCK,

};

include/linux/exportfs.h

+0 −13
Original line number Diff line number Diff line
@@ -250,19 +250,6 @@ struct export_operations { 
	unsigned long	flags;

};



/**

 * exportfs_lock_op_is_async() - export op supports async lock operation

 * @export_ops:	the nfs export operations to check

 *

 * Returns true if the nfs export_operations structure has

 * EXPORT_OP_ASYNC_LOCK in their flags set

 */

static inline bool

exportfs_lock_op_is_async(const struct export_operations *export_ops)

{

	return export_ops->flags & EXPORT_OP_ASYNC_LOCK;

}



extern int exportfs_encode_inode_fh(struct inode *inode, struct fid *fid,

				    int *max_len, struct inode *parent,

				    int flags);