Commit 58a033c9 authored by Jeff Layton's avatar Jeff Layton
Browse files

nfsd: remove fetch_iversion export operation 



Now that the i_version counter is reported in struct kstat, there is no
need for this export operation.

Acked-by: default avatarChuck Lever <chuck.lever@oracle.com>
Reviewed-by: default avatarNeilBrown <neilb@suse.de>
Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
parent 638e3e7d

fs/nfs/export.c

+0 −7
Original line number Diff line number Diff line
@@ -145,17 +145,10 @@ nfs_get_parent(struct dentry *dentry) 
	return parent;

}



static u64 nfs_fetch_iversion(struct inode *inode)

{

	nfs_revalidate_inode(inode, NFS_INO_INVALID_CHANGE);

	return inode_peek_iversion_raw(inode);

}



const struct export_operations nfs_export_ops = {

	.encode_fh = nfs_encode_fh,

	.fh_to_dentry = nfs_fh_to_dentry,

	.get_parent = nfs_get_parent,

	.fetch_iversion = nfs_fetch_iversion,

	.flags = EXPORT_OP_NOWCC|EXPORT_OP_NOSUBTREECHK|

		EXPORT_OP_CLOSE_BEFORE_UNLINK|EXPORT_OP_REMOTE_FS|

		EXPORT_OP_NOATOMIC_ATTR,

fs/nfsd/nfsfh.c

+0 −3
Original line number Diff line number Diff line
@@ -778,11 +778,8 @@ u64 nfsd4_change_attribute(struct kstat *stat, struct inode *inode) 
{

	u64 chattr;



	if (inode->i_sb->s_export_op->fetch_iversion)

		return inode->i_sb->s_export_op->fetch_iversion(inode);

	if (stat->result_mask & STATX_CHANGE_COOKIE) {

		chattr = stat->change_cookie;



		if (S_ISREG(inode->i_mode) &&

		    !(stat->attributes & STATX_ATTR_CHANGE_MONOTONIC)) {

			chattr += (u64)stat->ctime.tv_sec << 30;

include/linux/exportfs.h

+0 −1
Original line number Diff line number Diff line
@@ -213,7 +213,6 @@ struct export_operations { 
			  bool write, u32 *device_generation);

	int (*commit_blocks)(struct inode *inode, struct iomap *iomaps,

			     int nr_iomaps, struct iattr *iattr);

	u64 (*fetch_iversion)(struct inode *);

#define	EXPORT_OP_NOWCC			(0x1) /* don't collect v3 wcc data */

#define	EXPORT_OP_NOSUBTREECHK		(0x2) /* no subtree checking */

#define	EXPORT_OP_CLOSE_BEFORE_UNLINK	(0x4) /* close files before unlink */