Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d889d99 authored by Jeff Mahoney's avatar Jeff Mahoney Committed by Linus Torvalds
Browse files

reiserfs: make some warnings informational 



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: default avatarJeff Mahoney <jeffm@suse.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a5437152

fs/reiserfs/bitmap.c

+3 −3
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 


#define SET_OPTION(optname) \

   do { \

        reiserfs_warning(s, "reiserfs: option \"%s\" is set", #optname); \

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

}

fs/reiserfs/super.c

+6 −8
Original line number Diff line number Diff line
@@ -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 "
@@ -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));

fs/reiserfs/xattr.c

+4 −6
Original line number Diff line number Diff line
@@ -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;