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

Commit 2ccdc413 authored by Al Viro's avatar Al Viro
Browse files

kill reiserfs_bdevname() 



it's never called with NULL argument...

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent b42d570c

fs/reiserfs/procfs.c

+2 −2
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ int reiserfs_proc_info_init(struct super_block *sb) 
	char *s;



	/* Some block devices use /'s */

	strlcpy(b, reiserfs_bdevname(sb), BDEVNAME_SIZE);

	strlcpy(b, sb->s_id, BDEVNAME_SIZE);

	s = strchr(b, '/');

	if (s)

		*s = '!';
@@ -449,7 +449,7 @@ int reiserfs_proc_info_done(struct super_block *sb) 
		char *s;



		/* Some block devices use /'s */

		strlcpy(b, reiserfs_bdevname(sb), BDEVNAME_SIZE);

		strlcpy(b, sb->s_id, BDEVNAME_SIZE);

		s = strchr(b, '/');

		if (s)

			*s = '!';

fs/reiserfs/reiserfs.h

+0 −8
Original line number Diff line number Diff line
@@ -608,14 +608,6 @@ int reiserfs_resize(struct super_block *, unsigned long); 


#define SB_DISK_JOURNAL_HEAD(s) (SB_JOURNAL(s)->j_header_bh->)



/* A safe version of the "bdevname", which returns the "s_id" field of

 * a superblock or else "Null superblock" if the super block is NULL.

 */

static inline char *reiserfs_bdevname(struct super_block *s)

{

	return (s == NULL) ? "Null superblock" : s->s_id;

}



#define reiserfs_is_journal_aborted(journal) (unlikely (__reiserfs_is_journal_aborted (journal)))

static inline int __reiserfs_is_journal_aborted(struct reiserfs_journal

						*journal)

fs/reiserfs/super.c

+4 −4
Original line number Diff line number Diff line
@@ -1479,7 +1479,7 @@ static int read_super_block(struct super_block *s, int offset) 
	if (!bh) {

		reiserfs_warning(s, "sh-2006",

				 "bread failed (dev %s, block %lu, size %lu)",

				 reiserfs_bdevname(s), offset / s->s_blocksize,

				 s->s_id, offset / s->s_blocksize,

				 s->s_blocksize);

		return 1;

	}
@@ -1500,7 +1500,7 @@ static int read_super_block(struct super_block *s, int offset) 
	if (!bh) {

		reiserfs_warning(s, "sh-2007",

				 "bread failed (dev %s, block %lu, size %lu)",

				 reiserfs_bdevname(s), offset / s->s_blocksize,

				 s->s_id, offset / s->s_blocksize,

				 s->s_blocksize);

		return 1;

	}
@@ -1509,7 +1509,7 @@ static int read_super_block(struct super_block *s, int offset) 
	if (sb_blocksize(rs) != s->s_blocksize) {

		reiserfs_warning(s, "sh-2011", "can't find a reiserfs "

				 "filesystem on (dev %s, block %Lu, size %lu)",

				 reiserfs_bdevname(s),

				 s->s_id,

				 (unsigned long long)bh->b_blocknr,

				 s->s_blocksize);

		brelse(bh);
@@ -1825,7 +1825,7 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent) 
	/* try new format (64-th 1k block), which can contain reiserfs super block */

	else if (read_super_block(s, REISERFS_DISK_OFFSET_IN_BYTES)) {

		SWARN(silent, s, "sh-2021", "can not find reiserfs on %s",

		      reiserfs_bdevname(s));

		      s->s_id);

		goto error_unlocked;

	}