From: Steve French <sfrench@us.ibm.com>
Date: Sun, 9 Jan 2011 23:18:16 +0000 (+0000)
Subject: Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.38-rc1~446^2~7
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/acc6f11272ce4f77c40b1a6292eb198fd6aaf8c3

Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
	fs/cifs/dir.c
---

acc6f11272ce4f77c40b1a6292eb198fd6aaf8c3
diff --cc fs/cifs/dir.c
index 521d841b1fd1,db2a58c00f7b..ce8014345258
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
@@@ -715,13 -719,15 +719,22 @@@ static int cifs_ci_hash(const struct de
  	return 0;
  }
  
- static int cifs_ci_compare(struct dentry *dentry, struct qstr *a,
- 			   struct qstr *b)
+ static int cifs_ci_compare(const struct dentry *parent,
+ 		const struct inode *pinode,
+ 		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;
  }