aboutsummaryrefslogtreecommitdiffstats
path: root/fs/reiserfs
diff options
context:
space:
mode:
Diffstat (limited to 'fs/reiserfs')
-rw-r--r--fs/reiserfs/bitmap.c6
-rw-r--r--fs/reiserfs/super.c14
-rw-r--r--fs/reiserfs/xattr.c10
3 files changed, 13 insertions, 17 deletions
diff --git a/fs/reiserfs/bitmap.c b/fs/reiserfs/bitmap.c
index 4646caa60455..98b92a3da14a 100644
--- a/fs/reiserfs/bitmap.c
+++ b/fs/reiserfs/bitmap.c
@@ -40,8 +40,8 @@
40 40
41#define SET_OPTION(optname) \ 41#define SET_OPTION(optname) \
42 do { \ 42 do { \
43 reiserfs_warning(s, "reiserfs: option \"%s\" is set", #optname); \ 43 reiserfs_info(s, "block allocator option \"%s\" is set", #optname); \
44 set_bit(_ALLOC_ ## optname , &SB_ALLOC_OPTS(s)); \ 44 set_bit(_ALLOC_ ## optname , &SB_ALLOC_OPTS(s)); \
45 } while(0) 45 } while(0)
46#define TEST_OPTION(optname, s) \ 46#define TEST_OPTION(optname, s) \
47 test_bit(_ALLOC_ ## optname , &SB_ALLOC_OPTS(s)) 47 test_bit(_ALLOC_ ## optname , &SB_ALLOC_OPTS(s))
@@ -636,7 +636,7 @@ int reiserfs_parse_alloc_options(struct super_block *s, char *options)
636 return 1; 636 return 1;
637 } 637 }
638 638
639 reiserfs_warning(s, "allocator options = [%08x]\n", SB_ALLOC_OPTS(s)); 639 reiserfs_info(s, "allocator options = [%08x]\n", SB_ALLOC_OPTS(s));
640 return 0; 640 return 0;
641} 641}
642 642
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index 4ad40afe54e1..0428004dc638 100644
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -1371,13 +1371,11 @@ static int read_super_block(struct super_block *s, int offset)
1371 /* magic is of non-standard journal filesystem, look at s_version to 1371 /* magic is of non-standard journal filesystem, look at s_version to
1372 find which format is in use */ 1372 find which format is in use */
1373 if (sb_version(rs) == REISERFS_VERSION_2) 1373 if (sb_version(rs) == REISERFS_VERSION_2)
1374 reiserfs_warning(s, 1374 reiserfs_info(s, "found reiserfs format \"3.6\""
1375 "read_super_block: found reiserfs format \"3.6\"" 1375 " with non-standard journal\n");
1376 " with non-standard journal");
1377 else if (sb_version(rs) == REISERFS_VERSION_1) 1376 else if (sb_version(rs) == REISERFS_VERSION_1)
1378 reiserfs_warning(s, 1377 reiserfs_info(s, "found reiserfs format \"3.5\""
1379 "read_super_block: found reiserfs format \"3.5\"" 1378 " with non-standard journal\n");
1380 " with non-standard journal");
1381 else { 1379 else {
1382 reiserfs_warning(s, 1380 reiserfs_warning(s,
1383 "sh-2012: read_super_block: found unknown " 1381 "sh-2012: read_super_block: found unknown "
@@ -1456,8 +1454,8 @@ static __u32 find_hash_out(struct super_block *s)
1456 if (reiserfs_rupasov_hash(s)) { 1454 if (reiserfs_rupasov_hash(s)) {
1457 hash = YURA_HASH; 1455 hash = YURA_HASH;
1458 } 1456 }
1459 reiserfs_warning(s, "FS seems to be empty, autodetect " 1457 reiserfs_info(s, "FS seems to be empty, autodetect "
1460 "is using the default hash"); 1458 "is using the default hash\n");
1461 break; 1459 break;
1462 } 1460 }
1463 r5hash = GET_HASH_VALUE(r5_hash(de.de_name, de.de_namelen)); 1461 r5hash = GET_HASH_VALUE(r5_hash(de.de_name, de.de_namelen));
diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c
index ad92461cbfc3..e11b00472361 100644
--- a/fs/reiserfs/xattr.c
+++ b/fs/reiserfs/xattr.c
@@ -1182,12 +1182,10 @@ int reiserfs_xattr_init(struct super_block *s, int mount_flags)
1182 } 1182 }
1183 1183
1184 if (dentry && dentry->d_inode) 1184 if (dentry && dentry->d_inode)
1185 reiserfs_warning(s, 1185 reiserfs_info(s, "Created %s - "
1186 "Created %s on %s - reserved for " 1186 "reserved for xattr "
1187 "xattr storage.", 1187 "storage.\n",
1188 PRIVROOT_NAME, 1188 PRIVROOT_NAME);
1189 reiserfs_bdevname
1190 (inode->i_sb));
1191 } else if (!dentry->d_inode) { 1189 } else if (!dentry->d_inode) {
1192 dput(dentry); 1190 dput(dentry);
1193 dentry = NULL; 1191 dentry = NULL;