dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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

Signed-off-by: Steve French <sfrench@us.ibm.com>
This commit is contained in:
Steve French 2011-01-09 23:26:56 +00:00
parent acc6f11272
commit 197a1eeb7f
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fs/cifs/dir.c
View File

@ -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;
}