From: Al Viro <viro@zeniv.linux.org.uk>
Date: Tue, 28 Oct 2014 22:37:40 +0000 (-0400)
Subject: isofs_cmp(): we'll never see a dentry for . or ..
X-Git-Tag: v3.18-rc3~6^2~3
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=f643ff550afbc82a2bc7026f4a6d64427e4fbc99;p=~emulex%2Finfiniband.git

isofs_cmp(): we'll never see a dentry for . or ..

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---

diff --git a/fs/isofs/namei.c b/fs/isofs/namei.c
index 95295640d9c..6f6dd0c6429 100644
--- a/fs/isofs/namei.c
+++ b/fs/isofs/namei.c
@@ -18,23 +18,6 @@ static int
 isofs_cmp(struct dentry *dentry, const char *compare, int dlen)
 {
 	struct qstr qstr;
-
-	if (!compare)
-		return 1;
-
-	/* check special "." and ".." files */
-	if (dlen == 1) {
-		/* "." */
-		if (compare[0] == 0) {
-			if (!dentry->d_name.len)
-				return 0;
-			compare = ".";
-		} else if (compare[0] == 1) {
-			compare = "..";
-			dlen = 2;
-		}
-	}
-
 	qstr.name = compare;
 	qstr.len = dlen;
 	return dentry->d_op->d_compare(NULL, NULL, dentry->d_name.len, dentry->d_name.name, &qstr);
@@ -146,7 +129,8 @@ isofs_find_entry(struct inode *dir, struct dentry *dentry,
 				(!(de->flags[-sbi->s_high_sierra] & 1))) &&
 			(sbi->s_showassoc ||
 				(!(de->flags[-sbi->s_high_sierra] & 4)))) {
-			match = (isofs_cmp(dentry, dpnt, dlen) == 0);
+			if (dpnt && (dlen > 1 || dpnt[0] > 1))
+				match = (isofs_cmp(dentry, dpnt, dlen) == 0);
 		}
 		if (match) {
 			isofs_normalize_block_and_offset(de,