--- include/linux/nfsd/xdr4.h

+++ include/linux/nfsd/xdr4.h

@@ -480,18 +480,17 @@ static inline bool nfsd4_not_cached(stru

static inline void

set_change_info(struct nfsd4_change_info *cinfo, struct svc_fh *fhp)

{

- BUG_ON(!fhp->fh_pre_saved || !fhp->fh_post_saved);

- cinfo->atomic = 1;

+ BUG_ON(!fhp->fh_pre_saved);

+ cinfo->atomic = fhp->fh_post_saved;

cinfo->change_supported = IS_I_VERSION(fhp->fh_dentry->d_inode);

- if (cinfo->change_supported) {

- cinfo->before_change = fhp->fh_pre_change;

- cinfo->after_change = fhp->fh_post_change;

- } else {

- 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;

- }

+

+ 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;

+

}

int nfs4svc_encode_voidres(struct svc_rqst *, __be32 *, void *);