Merge tag 'nfsd-4.16' of git://linux-nfs.org/~bfields/linux

[muen/linux.git] / fs / nfsd / nfsfh.h

diff --git a/fs/nfsd/nfsfh.h b/fs/nfsd/nfsfh.h
index 99be87b50ebed67114b4e27119a3fa65c893a587..755e256a910393bf2b9a6147a63fc0300862b968 100644 (file)
--- a/fs/nfsd/nfsfh.h
+++ b/fs/nfsd/nfsfh.h
@@ -11,6 +11,7 @@
 #include <linux/crc32.h>
 #include <linux/sunrpc/svc.h>
 #include <uapi/linux/nfsd/nfsfh.h>
 #include <linux/crc32.h>
 #include <linux/sunrpc/svc.h>
 #include <uapi/linux/nfsd/nfsfh.h>

+#include <linux/iversion.h>

 
 static inline __u32 ino_t_to_u32(ino_t ino)
 {
 
 static inline __u32 ino_t_to_u32(ino_t ino)
 {


@@ -260,7 +261,7 @@ static inline u64 nfsd4_change_attribute(struct kstat *stat,
        chattr =  stat->ctime.tv_sec;
        chattr <<= 30;
        chattr += stat->ctime.tv_nsec;
        chattr =  stat->ctime.tv_sec;
        chattr <<= 30;
        chattr += stat->ctime.tv_nsec;

-       chattr += inode->i_version;
+       chattr += inode_query_iversion(inode);

        return chattr;
 }
 
        return chattr;
 }