diff options
| author | Steve French <sfrench@us.ibm.com> | 2011-01-09 23:26:56 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2011-01-09 23:26:56 +0000 |
| commit | 197a1eeb7f89c1d2ba93713398e9655899aa973e (patch) | |
| tree | cfc6452bd9d69b6ecd6bf5669d6103d4720765d4 /fs/cifs/dir.c | |
| parent | acc6f11272ce4f77c40b1a6292eb198fd6aaf8c3 (diff) | |
| download | kernel_samsung_tuna-197a1eeb7f89c1d2ba93713398e9655899aa973e.zip kernel_samsung_tuna-197a1eeb7f89c1d2ba93713398e9655899aa973e.tar.gz kernel_samsung_tuna-197a1eeb7f89c1d2ba93713398e9655899aa973e.tar.bz2 | |
[CIFS] Fix minor merge conflict in fs/cifs/dir.c
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/dir.c')
| -rw-r--r-- | fs/cifs/dir.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c index ce80143..db2a58c 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; } |