UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Jeff Mahoney 2009-03-30 14:02:23 -04:00 committed by Linus Torvalds
parent cacbe3d7ad
commit fd7cb031ef
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/linux/reiserfs_fs.h
View File

@ -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)
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;
} }
} }