Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[sfrench/cifs-2.6.git] / fs / utimes.c

diff --git a/fs/utimes.c b/fs/utimes.c
index 480f7c8c29da13ee10941f5cf5e560faffbde0a6..b3c88952465fa28cce7e0bb213fceaf59873fdf9 100644 (file)
--- a/fs/utimes.c
+++ b/fs/utimes.c
@@ -106,9 +106,16 @@ long do_utimes(int dfd, char __user *filename, struct timespec *times, int flags
                 if (IS_IMMUTABLE(inode))
                         goto dput_and_out;
 
-               if (current->fsuid != inode->i_uid &&
-                   (error = vfs_permission(&nd, MAY_WRITE)) != 0)
-                       goto dput_and_out;
+               if (current->fsuid != inode->i_uid) {
+                       if (f) {
+                               if (!(f->f_mode & FMODE_WRITE))
+                                       goto dput_and_out;
+                       } else {
+                               error = vfs_permission(&nd, MAY_WRITE);
+                               if (error)
+                                       goto dput_and_out;
+                       }
+               }
        }
        mutex_lock(&inode->i_mutex);
        error = notify_change(dentry, &newattrs);