Commit fd7cb031 authored by Jeff Mahoney's avatar Jeff Mahoney Committed by Linus Torvalds

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: default avatarJeff Mahoney <jeffm@suse.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent cacbe3d7
...@@ -560,10 +560,8 @@ static inline int uniqueness2type(__u32 uniqueness) ...@@ -560,10 +560,8 @@ static inline int uniqueness2type(__u32 uniqueness)
return TYPE_DIRECT; return TYPE_DIRECT;
case V1_DIRENTRY_UNIQUENESS: case V1_DIRENTRY_UNIQUENESS:
return TYPE_DIRENTRY; return TYPE_DIRENTRY;
default:
reiserfs_warning(NULL, "vs-500", "unknown uniqueness %d",
uniqueness);
case V1_ANY_UNIQUENESS: case V1_ANY_UNIQUENESS:
default:
return TYPE_ANY; return TYPE_ANY;
} }
} }
...@@ -580,9 +578,8 @@ static inline __u32 type2uniqueness(int type) ...@@ -580,9 +578,8 @@ static inline __u32 type2uniqueness(int type)
return V1_DIRECT_UNIQUENESS; return V1_DIRECT_UNIQUENESS;
case TYPE_DIRENTRY: case TYPE_DIRENTRY:
return V1_DIRENTRY_UNIQUENESS; return V1_DIRENTRY_UNIQUENESS;
default:
reiserfs_warning(NULL, "vs-501", "unknown type %d", type);
case TYPE_ANY: case TYPE_ANY:
default:
return V1_ANY_UNIQUENESS; return V1_ANY_UNIQUENESS;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment