These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / fs / nfsd / xdr4.h

diff --git a/kernel/fs/nfsd/xdr4.h b/kernel/fs/nfsd/xdr4.h
index 2f8c092..ce7362c 100644 (file)
--- a/kernel/fs/nfsd/xdr4.h
+++ b/kernel/fs/nfsd/xdr4.h
@@ -273,6 +273,7 @@ struct nfsd4_read {
        u32             rd_length;          /* request */
        int             rd_vlen;
        struct file     *rd_filp;
+       bool            rd_tmp_file;
        
        struct svc_rqst *rd_rqstp;          /* response */
        struct svc_fh * rd_fhp;             /* response */
@@ -631,7 +632,7 @@ static inline void
 set_change_info(struct nfsd4_change_info *cinfo, struct svc_fh *fhp)
 {
        BUG_ON(!fhp->fh_pre_saved);
-       cinfo->atomic = fhp->fh_post_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;