Skip to content

Commit

Permalink
reiserfs: make some warnings informational
Browse files Browse the repository at this point in the history
In several places, reiserfs_warning is used when there is no warning, just
a notice. This patch changes some of them to indicate that the message
is merely informational.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Jeff Mahoney authored and Linus Torvalds committed Mar 30, 2009
1 parent a543715 commit 1d889d9
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 17 deletions.
6 changes: 3 additions & 3 deletions fs/reiserfs/bitmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@

#define SET_OPTION(optname) \
do { \
reiserfs_warning(s, "reiserfs: option \"%s\" is set", #optname); \
set_bit(_ALLOC_ ## optname , &SB_ALLOC_OPTS(s)); \
reiserfs_info(s, "block allocator option \"%s\" is set", #optname); \
set_bit(_ALLOC_ ## optname , &SB_ALLOC_OPTS(s)); \
} while(0)
#define TEST_OPTION(optname, s) \
test_bit(_ALLOC_ ## optname , &SB_ALLOC_OPTS(s))
Expand Down Expand Up @@ -636,7 +636,7 @@ int reiserfs_parse_alloc_options(struct super_block *s, char *options)
return 1;
}

reiserfs_warning(s, "allocator options = [%08x]\n", SB_ALLOC_OPTS(s));
reiserfs_info(s, "allocator options = [%08x]\n", SB_ALLOC_OPTS(s));
return 0;
}

Expand Down
14 changes: 6 additions & 8 deletions fs/reiserfs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -1371,13 +1371,11 @@ static int read_super_block(struct super_block *s, int offset)
/* magic is of non-standard journal filesystem, look at s_version to
find which format is in use */
if (sb_version(rs) == REISERFS_VERSION_2)
reiserfs_warning(s,
"read_super_block: found reiserfs format \"3.6\""
" with non-standard journal");
reiserfs_info(s, "found reiserfs format \"3.6\""
" with non-standard journal\n");
else if (sb_version(rs) == REISERFS_VERSION_1)
reiserfs_warning(s,
"read_super_block: found reiserfs format \"3.5\""
" with non-standard journal");
reiserfs_info(s, "found reiserfs format \"3.5\""
" with non-standard journal\n");
else {
reiserfs_warning(s,
"sh-2012: read_super_block: found unknown "
Expand Down Expand Up @@ -1456,8 +1454,8 @@ static __u32 find_hash_out(struct super_block *s)
if (reiserfs_rupasov_hash(s)) {
hash = YURA_HASH;
}
reiserfs_warning(s, "FS seems to be empty, autodetect "
"is using the default hash");
reiserfs_info(s, "FS seems to be empty, autodetect "
"is using the default hash\n");
break;
}
r5hash = GET_HASH_VALUE(r5_hash(de.de_name, de.de_namelen));
Expand Down
10 changes: 4 additions & 6 deletions fs/reiserfs/xattr.c
Original file line number Diff line number Diff line change
Expand Up @@ -1182,12 +1182,10 @@ int reiserfs_xattr_init(struct super_block *s, int mount_flags)
}

if (dentry && dentry->d_inode)
reiserfs_warning(s,
"Created %s on %s - reserved for "
"xattr storage.",
PRIVROOT_NAME,
reiserfs_bdevname
(inode->i_sb));
reiserfs_info(s, "Created %s - "
"reserved for xattr "
"storage.\n",
PRIVROOT_NAME);
} else if (!dentry->d_inode) {
dput(dentry);
dentry = NULL;
Expand Down

0 comments on commit 1d889d9

Please sign in to comment.