---

yaml --- r: 253703 b: refs/heads/master c: 50338b8 h: refs/heads/master i: 253701: 36fb4ed 253699: da2fe2a 253695: 34ce681 v: v3
git-mirror · Jun 16, 2011 · 790ca16 · 790ca16
1 parent da71910
commit 790ca16
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a685e08987d1edf1995b76511d4c98ea0e905377
+refs/heads/master: 50338b889dc504c69e0cb316ac92d1b9e51f3c8a
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
@@ -2713,8 +2713,10 @@ static long do_unlinkat(int dfd, const char __user *pathname)
 	error = PTR_ERR(dentry);
 	if (!IS_ERR(dentry)) {
 		/* Why not before? Because we want correct error value */
+		if (nd.last.name[nd.last.len])
+			goto slashes;
 		inode = dentry->d_inode;
-		if (nd.last.name[nd.last.len] || !inode)
+		if (!inode)
 			goto slashes;
 		ihold(inode);
 		error = mnt_want_write(nd.path.mnt);