From: Steve French <sfrench@us.ibm.com>
Date: Sun, 9 Jan 2011 23:26:56 +0000 (+0000)
Subject: [CIFS] Fix minor merge conflict in fs/cifs/dir.c
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=197a1eeb7f89c1d2ba93713398e9655899aa973e;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

[CIFS] Fix minor merge conflict in fs/cifs/dir.c

Signed-off-by: Steve French <sfrench@us.ibm.com>
---

diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
index ce8014345258..db2a58c00f7b 100644
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
@@ -724,17 +724,10 @@ static int cifs_ci_compare(const struct dentry *parent,
 		const struct dentry *dentry, const struct inode *inode,
 		unsigned int len, const char *str, const struct qstr *name)
 {
-<<<<<<< HEAD
-	struct nls_table *codepage = CIFS_SB(dentry->d_inode->i_sb)->local_nls;
-
-	if ((a->len == b->len) &&
-	    (nls_strnicmp(codepage, a->name, b->name, a->len) == 0))
-=======
 	struct nls_table *codepage = CIFS_SB(pinode->i_sb)->local_nls;
 
 	if ((name->len == len) &&
 	    (nls_strnicmp(codepage, name->name, str, len) == 0))
->>>>>>> 0c21e3aaf6ae85bee804a325aa29c325209180fd
 		return 0;
 	return 1;
 }