projects / ipfire-2.x.git / blame
| Commit | Line | Data |
|---|---|---|
| 6a930a95 BS |
1 | From: Jeff Mahoney <jeffm@suse.com> |
| 2 | Subject: reiserfs: make some warnings informational | |
| 3 | ||
| 4 | In several places, reiserfs_warning is used when there is no warning, just | |
| 5 | a notice. This patch changes some of them to indicate that the message | |
| 6 | is merely informational. | |
| 7 | ||
| 8 | Signed-off-by: Jeff Mahoney <jeffm@suse.com> | |
| 9 | ||
| 10 | -- | |
| 11 | fs/reiserfs/bitmap.c | 6 +++--- | |
| 12 | fs/reiserfs/super.c | 14 ++++++-------- | |
| 13 | fs/reiserfs/xattr.c | 10 ++++------ | |
| 14 | 3 files changed, 13 insertions(+), 17 deletions(-) | |
| 15 | ||
| 16 | --- a/fs/reiserfs/bitmap.c | |
| 17 | +++ b/fs/reiserfs/bitmap.c | |
| 18 | @@ -40,8 +40,8 @@ | |
| 19 | ||
| 20 | #define SET_OPTION(optname) \ | |
| 21 | do { \ | |
| 22 | - reiserfs_warning(s, "reiserfs: option \"%s\" is set", #optname); \ | |
| 23 | - set_bit(_ALLOC_ ## optname , &SB_ALLOC_OPTS(s)); \ | |
| 24 | + reiserfs_info(s, "block allocator option \"%s\" is set", #optname); \ | |
| 25 | + set_bit(_ALLOC_ ## optname , &SB_ALLOC_OPTS(s)); \ | |
| 26 | } while(0) | |
| 27 | #define TEST_OPTION(optname, s) \ | |
| 28 | test_bit(_ALLOC_ ## optname , &SB_ALLOC_OPTS(s)) | |
| 29 | @@ -636,7 +636,7 @@ int reiserfs_parse_alloc_options(struct | |
| 30 | return 1; | |
| 31 | } | |
| 32 | ||
| 33 | - reiserfs_warning(s, "allocator options = [%08x]\n", SB_ALLOC_OPTS(s)); | |
| 34 | + reiserfs_info(s, "allocator options = [%08x]\n", SB_ALLOC_OPTS(s)); | |
| 35 | return 0; | |
| 36 | } | |
| 37 | ||
| 38 | --- a/fs/reiserfs/super.c | |
| 39 | +++ b/fs/reiserfs/super.c | |
| 40 | @@ -1369,13 +1369,11 @@ static int read_super_block(struct super | |
| 41 | /* magic is of non-standard journal filesystem, look at s_version to | |
| 42 | find which format is in use */ | |
| 43 | if (sb_version(rs) == REISERFS_VERSION_2) | |
| 44 | - reiserfs_warning(s, | |
| 45 | - "read_super_block: found reiserfs format \"3.6\"" | |
| 46 | - " with non-standard journal"); | |
| 47 | + reiserfs_info(s, "found reiserfs format \"3.6\"" | |
| 48 | + " with non-standard journal\n"); | |
| 49 | else if (sb_version(rs) == REISERFS_VERSION_1) | |
| 50 | - reiserfs_warning(s, | |
| 51 | - "read_super_block: found reiserfs format \"3.5\"" | |
| 52 | - " with non-standard journal"); | |
| 53 | + reiserfs_info(s, "found reiserfs format \"3.5\"" | |
| 54 | + " with non-standard journal\n"); | |
| 55 | else { | |
| 56 | reiserfs_warning(s, | |
| 57 | "sh-2012: read_super_block: found unknown " | |
| 58 | @@ -1454,8 +1452,8 @@ static __u32 find_hash_out(struct super_ | |
| 59 | if (reiserfs_rupasov_hash(s)) { | |
| 60 | hash = YURA_HASH; | |
| 61 | } | |
| 62 | - reiserfs_warning(s, "FS seems to be empty, autodetect " | |
| 63 | - "is using the default hash"); | |
| 64 | + reiserfs_info(s, "FS seems to be empty, autodetect " | |
| 65 | + "is using the default hash\n"); | |
| 66 | break; | |
| 67 | } | |
| 68 | r5hash = GET_HASH_VALUE(r5_hash(de.de_name, de.de_namelen)); | |
| 69 | --- a/fs/reiserfs/xattr.c | |
| 70 | +++ b/fs/reiserfs/xattr.c | |
| 71 | @@ -1182,12 +1182,10 @@ int reiserfs_xattr_init(struct super_blo | |
| 72 | } | |
| 73 | ||
| 74 | if (dentry && dentry->d_inode) | |
| 75 | - reiserfs_warning(s, | |
| 76 | - "Created %s on %s - reserved for " | |
| 77 | - "xattr storage.", | |
| 78 | - PRIVROOT_NAME, | |
| 79 | - reiserfs_bdevname | |
| 80 | - (inode->i_sb)); | |
| 81 | + reiserfs_info(s, "Created %s - " | |
| 82 | + "reserved for xattr " | |
| 83 | + "storage.\n", | |
| 84 | + PRIVROOT_NAME); | |
| 85 | } else if (!dentry->d_inode) { | |
| 86 | dput(dentry); | |
| 87 | dentry = NULL; |