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: Chuck Lever <chuck.lever@oracle.com>
Reviewed-by: NeilBrown <neilb@suse.de>
Signed-off-by: Jeff Layton <jlayton@kernel.org>

diff --git a/fs/nfs/export.c b/fs/nfs/export.c
index 01596f2..1a9d5aa 100644 (file)
--- a/fs/nfs/export.c
+++ b/fs/nfs/export.c
@@ -145,17 +145,10 @@ out:
        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,

diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c
index 3a01c86..76ea268 100644 (file)
--- a/fs/nfsd/nfsfh.c
+++ b/fs/nfsd/nfsfh.c
@@ -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;

diff --git a/include/linux/exportfs.h b/include/linux/exportfs.h
index fe84890..9f4d4bc 100644 (file)
--- a/include/linux/exportfs.h
+++ b/include/linux/exportfs.h
@@ -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 */