Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux...

[uclinux-h8/linux.git] / fs / nfsd / vfs.c

diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index f501a9b..989129e 100644 (file)
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -445,6 +445,16 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap,
                if (err)
                        goto out;
                size_change = 1;
+
+               /*
+                * RFC5661, Section 18.30.4:
+                *   Changing the size of a file with SETATTR indirectly
+                *   changes the time_modify and change attributes.
+                *
+                * (and similar for the older RFCs)
+                */
+               if (iap->ia_size != i_size_read(inode))
+                       iap->ia_valid |= ATTR_MTIME;
        }
 
        iap->ia_valid |= ATTR_CTIME;
@@ -649,6 +659,7 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type,
 {
        struct path     path;
        struct inode    *inode;
+       struct file     *file;
        int             flags = O_RDONLY|O_LARGEFILE;
        __be32          err;
        int             host_err = 0;
@@ -703,19 +714,25 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type,
                else
                        flags = O_WRONLY|O_LARGEFILE;
        }
-       *filp = dentry_open(&path, flags, current_cred());
-       if (IS_ERR(*filp)) {
-               host_err = PTR_ERR(*filp);
-               *filp = NULL;
-       } else {
-               host_err = ima_file_check(*filp, may_flags);
 
-               if (may_flags & NFSD_MAY_64BIT_COOKIE)
-                       (*filp)->f_mode |= FMODE_64BITHASH;
-               else
-                       (*filp)->f_mode |= FMODE_32BITHASH;
+       file = dentry_open(&path, flags, current_cred());
+       if (IS_ERR(file)) {
+               host_err = PTR_ERR(file);
+               goto out_nfserr;
        }
 
+       host_err = ima_file_check(file, may_flags, 0);
+       if (host_err) {
+               nfsd_close(file);
+               goto out_nfserr;
+       }
+
+       if (may_flags & NFSD_MAY_64BIT_COOKIE)
+               file->f_mode |= FMODE_64BITHASH;
+       else
+               file->f_mode |= FMODE_32BITHASH;
+
+       *filp = file;
 out_nfserr:
        err = nfserrno(host_err);
 out: