From 86f9611389eb3e646a1f55988f5f796f629055c0 Mon Sep 17 00:00:00 2001
From: Michael Kerrisk <mtk.manpages@googlemail.com>
Date: Mon, 9 Jun 2008 21:16:09 -0700
Subject: [PATCH] --- yaml --- r: 98441 b: refs/heads/master c:
 c70f84417429f41519be0197a1092a53c2201f47 h: refs/heads/master i:   98439:
 ce571c638fc279705f1b3ed9beffd8a8b76e2955 v: v3

---
 [refs]            |  2 +-
 trunk/fs/utimes.c | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index e492c268c96d..c4ff84b9e3a9 100644
--- 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
index 118d1c3241be..b6b664e7145e 100644
--- 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);