aboutsummaryrefslogtreecommitdiffstats
path: root/fs/hfs/string.c
diff options
context:
space:
mode:
authorNick Piggin <npiggin@kernel.dk>2011-01-07 01:49:27 -0500
committerNick Piggin <npiggin@kernel.dk>2011-01-07 01:50:19 -0500
commit621e155a3591962420eacdd39f6f0aa29ceb221e (patch)
tree387a9fb396f1bf24514b712c294182e36ba51076 /fs/hfs/string.c
parentfb2d5b86aff355a27ebfc132d3c99f4a940cc3fe (diff)
fs: change d_compare for rcu-walk
Change d_compare so it may be called from lock-free RCU lookups. This does put significant restrictions on what may be done from the callback, however there don't seem to have been any problems with in-tree fses. If some strange use case pops up that _really_ cannot cope with the rcu-walk rules, we can just add new rcu-unaware callbacks, which would cause name lookup to drop out of rcu-walk mode. For in-tree filesystems, this is just a mechanical change. Signed-off-by: Nick Piggin <npiggin@kernel.dk>
Diffstat (limited to 'fs/hfs/string.c')
-rw-r--r--fs/hfs/string.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/hfs/string.c b/fs/hfs/string.c
index 927a5af79428..aaf90d0d6940 100644
--- a/fs/hfs/string.c
+++ b/fs/hfs/string.c
@@ -92,21 +92,21 @@ int hfs_strcmp(const unsigned char *s1, unsigned int len1,
92 * Test for equality of two strings in the HFS filename character ordering. 92 * Test for equality of two strings in the HFS filename character ordering.
93 * return 1 on failure and 0 on success 93 * return 1 on failure and 0 on success
94 */ 94 */
95int hfs_compare_dentry(struct dentry *dentry, struct qstr *s1, struct qstr *s2) 95int hfs_compare_dentry(const struct dentry *parent, const struct inode *pinode,
96 const struct dentry *dentry, const struct inode *inode,
97 unsigned int len, const char *str, const struct qstr *name)
96{ 98{
97 const unsigned char *n1, *n2; 99 const unsigned char *n1, *n2;
98 int len;
99 100
100 len = s1->len;
101 if (len >= HFS_NAMELEN) { 101 if (len >= HFS_NAMELEN) {
102 if (s2->len < HFS_NAMELEN) 102 if (name->len < HFS_NAMELEN)
103 return 1; 103 return 1;
104 len = HFS_NAMELEN; 104 len = HFS_NAMELEN;
105 } else if (len != s2->len) 105 } else if (len != name->len)
106 return 1; 106 return 1;
107 107
108 n1 = s1->name; 108 n1 = str;
109 n2 = s2->name; 109 n2 = name->name;
110 while (len--) { 110 while (len--) {
111 if (caseorder[*n1++] != caseorder[*n2++]) 111 if (caseorder[*n1++] != caseorder[*n2++])
112 return 1; 112 return 1;