]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/blob - src/patches/suse-2.6.27.25/patches.suse/reiserfs_warning-reentrant
Updated xen patches taken from suse.
[people/teissler/ipfire-2.x.git] / src / patches / suse-2.6.27.25 / patches.suse / reiserfs_warning-reentrant
1 From: Jeff Mahoney <jeffm@suse.com>
2 Subject: [PATCH] reiserfs: eliminate reiserfs_warning from uniqueness functions
3
4 uniqueness2type and type2uniquness issue a warning when the value is
5 unknown. When called from reiserfs_warning, this causes a re-entrancy
6 problem and deadlocks on the error buffer lock.
7
8 Signed-off-by: Jeff Mahoney <jeffm@suse.com>
9 ---
10 include/linux/reiserfs_fs.h | 7 ++-----
11 1 file changed, 2 insertions(+), 5 deletions(-)
12
13 --- a/include/linux/reiserfs_fs.h
14 +++ b/include/linux/reiserfs_fs.h
15 @@ -560,10 +560,8 @@ static inline int uniqueness2type(__u32
16 return TYPE_DIRECT;
17 case V1_DIRENTRY_UNIQUENESS:
18 return TYPE_DIRENTRY;
19 - default:
20 - reiserfs_warning(NULL, "vs-500", "unknown uniqueness %d",
21 - uniqueness);
22 case V1_ANY_UNIQUENESS:
23 + default:
24 return TYPE_ANY;
25 }
26 }
27 @@ -580,9 +578,8 @@ static inline __u32 type2uniqueness(int
28 return V1_DIRECT_UNIQUENESS;
29 case TYPE_DIRENTRY:
30 return V1_DIRENTRY_UNIQUENESS;
31 - default:
32 - reiserfs_warning(NULL, "vs-501", "unknown type %d", type);
33 case TYPE_ANY:
34 + default:
35 return V1_ANY_UNIQUENESS;
36 }
37 }