diff options
| author | Jeff Mahoney <jeffm@suse.com> | 2009-03-30 20:02:23 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-30 21:16:36 +0200 |
| commit | fd7cb031efb1dd71cb731668e2f597d9e61acdcb (patch) | |
| tree | 06ac5360f93d62e76eda0f72f0b2b19974d56df4 /include | |
| parent | reiserfs: prepare_error_buf wrongly consumes va_arg (diff) | |
| download | linux-fd7cb031efb1dd71cb731668e2f597d9e61acdcb.tar.xz linux-fd7cb031efb1dd71cb731668e2f597d9e61acdcb.zip | |
reiserfs: eliminate reiserfs_warning from uniqueness functions
uniqueness2type and type2uniquness issue a warning when the value is
unknown. When called from reiserfs_warning, this causes a re-entrancy
problem and deadlocks on the error buffer lock.
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/reiserfs_fs.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h index 056e2a3b04e3..cf5407ee0f32 100644 --- a/include/linux/reiserfs_fs.h +++ b/include/linux/reiserfs_fs.h @@ -560,10 +560,8 @@ static inline int uniqueness2type(__u32 uniqueness) return TYPE_DIRECT; case V1_DIRENTRY_UNIQUENESS: return TYPE_DIRENTRY; - default: - reiserfs_warning(NULL, "vs-500", "unknown uniqueness %d", - uniqueness); case V1_ANY_UNIQUENESS: + default: return TYPE_ANY; } } @@ -580,9 +578,8 @@ static inline __u32 type2uniqueness(int type) return V1_DIRECT_UNIQUENESS; case TYPE_DIRENTRY: return V1_DIRENTRY_UNIQUENESS; - default: - reiserfs_warning(NULL, "vs-501", "unknown type %d", type); case TYPE_ANY: + default: return V1_ANY_UNIQUENESS; } } |