nfsd: simplify nfsd4_change_info

It doesn't make sense to carry all these extra fields around.  Just
make everything into change attribute from the start.

This is just cleanup, there should be no change in behavior.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index ef1f553666168ae29926ba7abaf9f979eb63c406..7f650fa47006e9e19921f821cd83dcfc5ee34212 100644 (file)
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -2459,15 +2459,8 @@ static __be32 *encode_time_delta(__be32 *p, struct inode *inode)
 static __be32 *encode_cinfo(__be32 *p, struct nfsd4_change_info *c)
 {
        *p++ = cpu_to_be32(c->atomic);
-       if (c->change_supported) {
-               p = xdr_encode_hyper(p, c->before_change);
-               p = xdr_encode_hyper(p, c->after_change);
-       } else {
-               *p++ = cpu_to_be32(c->before_ctime_sec);
-               *p++ = cpu_to_be32(c->before_ctime_nsec);
-               *p++ = cpu_to_be32(c->after_ctime_sec);
-               *p++ = cpu_to_be32(c->after_ctime_nsec);
-       }
+       p = xdr_encode_hyper(p, c->before_change);
+       p = xdr_encode_hyper(p, c->after_change);
        return p;
 }
 

diff --git a/fs/nfsd/xdr4.h b/fs/nfsd/xdr4.h
index e12fbe382e3f349f4476b0d07acb3acfc448426a..b4556e86e97c326bc44543c06dd7806aacd41757 100644 (file)
--- a/fs/nfsd/xdr4.h
+++ b/fs/nfsd/xdr4.h
@@ -76,12 +76,7 @@ static inline bool nfsd4_has_session(struct nfsd4_compound_state *cs)
 
 struct nfsd4_change_info {
        u32             atomic;
-       bool            change_supported;
-       u32             before_ctime_sec;
-       u32             before_ctime_nsec;
        u64             before_change;
-       u32             after_ctime_sec;
-       u32             after_ctime_nsec;
        u64             after_change;
 };
 
@@ -754,15 +749,9 @@ set_change_info(struct nfsd4_change_info *cinfo, struct svc_fh *fhp)
 {
        BUG_ON(!fhp->fh_pre_saved);
        cinfo->atomic = (u32)fhp->fh_post_saved;
-       cinfo->change_supported = IS_I_VERSION(d_inode(fhp->fh_dentry));
 
        cinfo->before_change = fhp->fh_pre_change;
        cinfo->after_change = fhp->fh_post_change;
-       cinfo->before_ctime_sec = fhp->fh_pre_ctime.tv_sec;
-       cinfo->before_ctime_nsec = fhp->fh_pre_ctime.tv_nsec;
-       cinfo->after_ctime_sec = fhp->fh_post_attr.ctime.tv_sec;
-       cinfo->after_ctime_nsec = fhp->fh_post_attr.ctime.tv_nsec;
-
 }