---

yaml --- r: 98441 b: refs/heads/master c: c70f844 h: refs/heads/master i: 98439: ce571c6 v: v3
git-mirror · Jun 23, 2008 · 86f9611 · 86f9611
1 parent ccd25e0
commit 86f9611
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4cca92264e61a90b43fc4e076cd25b7f4e16dc61
+refs/heads/master: c70f84417429f41519be0197a1092a53c2201f47
diff --git a/trunk/fs/utimes.c b/trunk/fs/utimes.c
@@ -148,14 +148,9 @@ long do_utimes(int dfd, char __user *filename, struct timespec *times, int flags
 			goto mnt_drop_write_and_out;
 
 		if (!is_owner_or_cap(inode)) {
-			if (f) {
-				if (!(f->f_mode & FMODE_WRITE))
-					goto mnt_drop_write_and_out;
-			} else {
-				error = vfs_permission(&nd, MAY_WRITE);
-				if (error)
-					goto mnt_drop_write_and_out;
-			}
+			error = permission(inode, MAY_WRITE, NULL);
+			if (error)
+				goto mnt_drop_write_and_out;
 		}
 	}
 	mutex_lock(&inode->i_mutex);