projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'xenarm-for-3.11-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
fs
/
hfs
/
string.c
diff --git
a/fs/hfs/string.c
b/fs/hfs/string.c
index 495a976a3cc9aa0a0b6e56194ae8f91243129ae5..85b610c3909fbad5b5da73343f29cd9b2b84b96d 100644
(file)
--- a/
fs/hfs/string.c
+++ b/
fs/hfs/string.c
@@
-51,8
+51,7
@@
static unsigned char caseorder[256] = {
/*
* Hash a string to an integer in a case-independent way
*/
/*
* Hash a string to an integer in a case-independent way
*/
-int hfs_hash_dentry(const struct dentry *dentry, const struct inode *inode,
- struct qstr *this)
+int hfs_hash_dentry(const struct dentry *dentry, struct qstr *this)
{
const unsigned char *name = this->name;
unsigned int hash, len = this->len;
{
const unsigned char *name = this->name;
unsigned int hash, len = this->len;
@@
-93,8
+92,7
@@
int hfs_strcmp(const unsigned char *s1, unsigned int len1,
* Test for equality of two strings in the HFS filename character ordering.
* return 1 on failure and 0 on success
*/
* Test for equality of two strings in the HFS filename character ordering.
* return 1 on failure and 0 on success
*/
-int hfs_compare_dentry(const struct dentry *parent, const struct inode *pinode,
- const struct dentry *dentry, const struct inode *inode,
+int hfs_compare_dentry(const struct dentry *parent, const struct dentry *dentry,
unsigned int len, const char *str, const struct qstr *name)
{
const unsigned char *n1, *n2;
unsigned int len, const char *str, const struct qstr *name)
{
const unsigned char *n1, *n2;