2 files changed, 13 insertions, 2 deletions

diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index 3c627128e205..29b7e63cb32c 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -100,7 +100,15 @@ do_open_lookup(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_o
                 status = nfsd_create_v3(rqstp, current_fh, open->op_fname.data,
                                         open->op_fname.len, &open->op_iattr,
                                         &resfh, open->op_createmode,
-                                        (u32 *)open->op_verf.data, &open->op_truncate, &created);
+                                        (u32 *)open->op_verf.data,
+                                        &open->op_truncate, &created);
+
+                /* If we ever decide to use different attrs to store the
+                 * verifier in nfsd_create_v3, then we'll need to change this
+                 */
+                if (open->op_createmode == NFS4_CREATE_EXCLUSIVE && status == 0)
+                        open->op_bmval[1] |= (FATTR4_WORD1_TIME_ACCESS |
+                                                FATTR4_WORD1_TIME_MODIFY);
         } else {
                 status = nfsd_lookup(rqstp, current_fh,
                                      open->op_fname.data, open->op_fname.len, &resfh);
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index ee96a897a29e..a0c2b253818b 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -1309,7 +1309,10 @@ nfsd_create_v3(struct svc_rqst *rqstp, struct svc_fh *fhp,
 
         if (createmode == NFS3_CREATE_EXCLUSIVE) {
                 /* solaris7 gets confused (bugid 4218508) if these have
-                 * the high bit set, so just clear the high bits.
+                 * the high bit set, so just clear the high bits. If this is
+                 * ever changed to use different attrs for storing the
+                 * verifier, then do_open_lookup() will also need to be fixed
+                 * accordingly.
                  */
                 v_mtime = verifier[0]&0x7fffffff;
                 v_atime = verifier[1]&0x7fffffff;