diff options
author | Nick Piggin <npiggin@kernel.dk> | 2011-01-07 01:49:27 -0500 |
---|---|---|
committer | Nick Piggin <npiggin@kernel.dk> | 2011-01-07 01:50:19 -0500 |
commit | 621e155a3591962420eacdd39f6f0aa29ceb221e (patch) | |
tree | 387a9fb396f1bf24514b712c294182e36ba51076 /fs/hfsplus/unicode.c | |
parent | fb2d5b86aff355a27ebfc132d3c99f4a940cc3fe (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/hfsplus/unicode.c')
-rw-r--r-- | fs/hfsplus/unicode.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/fs/hfsplus/unicode.c b/fs/hfsplus/unicode.c index b66d67de882c..b178c997efa8 100644 --- a/fs/hfsplus/unicode.c +++ b/fs/hfsplus/unicode.c | |||
@@ -363,9 +363,12 @@ int hfsplus_hash_dentry(struct dentry *dentry, struct qstr *str) | |||
363 | * Composed unicode characters are decomposed and case-folding is performed | 363 | * Composed unicode characters are decomposed and case-folding is performed |
364 | * if the appropriate bits are (un)set on the superblock. | 364 | * if the appropriate bits are (un)set on the superblock. |
365 | */ | 365 | */ |
366 | int hfsplus_compare_dentry(struct dentry *dentry, struct qstr *s1, struct qstr *s2) | 366 | int hfsplus_compare_dentry(const struct dentry *parent, |
367 | const struct inode *pinode, | ||
368 | const struct dentry *dentry, const struct inode *inode, | ||
369 | unsigned int len, const char *str, const struct qstr *name) | ||
367 | { | 370 | { |
368 | struct super_block *sb = dentry->d_sb; | 371 | struct super_block *sb = parent->d_sb; |
369 | int casefold, decompose, size; | 372 | int casefold, decompose, size; |
370 | int dsize1, dsize2, len1, len2; | 373 | int dsize1, dsize2, len1, len2; |
371 | const u16 *dstr1, *dstr2; | 374 | const u16 *dstr1, *dstr2; |
@@ -375,10 +378,10 @@ int hfsplus_compare_dentry(struct dentry *dentry, struct qstr *s1, struct qstr * | |||
375 | 378 | ||
376 | casefold = test_bit(HFSPLUS_SB_CASEFOLD, &HFSPLUS_SB(sb)->flags); | 379 | casefold = test_bit(HFSPLUS_SB_CASEFOLD, &HFSPLUS_SB(sb)->flags); |
377 | decompose = !test_bit(HFSPLUS_SB_NODECOMPOSE, &HFSPLUS_SB(sb)->flags); | 380 | decompose = !test_bit(HFSPLUS_SB_NODECOMPOSE, &HFSPLUS_SB(sb)->flags); |
378 | astr1 = s1->name; | 381 | astr1 = str; |
379 | len1 = s1->len; | 382 | len1 = len; |
380 | astr2 = s2->name; | 383 | astr2 = name->name; |
381 | len2 = s2->len; | 384 | len2 = name->len; |
382 | dsize1 = dsize2 = 0; | 385 | dsize1 = dsize2 = 0; |
383 | dstr1 = dstr2 = NULL; | 386 | dstr1 = dstr2 = NULL; |
384 | 387 | ||