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

Commit f7f67540 authored by Salah Triki's avatar Salah Triki Committed by Luis de Bethencourt
Browse files

fs: befs: replace befs_bread by sb_bread 

Since befs_bread merely calls sb_bread, replace it by sb_bread.

Link: http://lkml.kernel.org/r/1466800258-4542-1-git-send-email-salah.triki@gmail.com


Signed-off-by: default avatarSalah Triki <salah.triki@gmail.com>
Acked-by: default avatarLuis de Bethencourt <luisbg@osg.samsung.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent f0f2536f

fs/befs/datastream.c

+3 −3
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ befs_find_brun_indirect(struct super_block *sb, 


	/* Examine blocks of the indirect run one at a time */

	for (i = 0; i < indirect.len; i++) {

		indirblock = befs_bread(sb, indirblockno + i);

		indirblock = sb_bread(sb, indirblockno + i);

		if (indirblock == NULL) {

			befs_debug(sb, "---> %s failed to read "

				   "disk block %lu from the indirect brun",
@@ -471,7 +471,7 @@ befs_find_brun_dblindirect(struct super_block *sb, 
	}



	dbl_indir_block =

	    befs_bread(sb, iaddr2blockno(sb, &data->double_indirect) +

	    sb_bread(sb, iaddr2blockno(sb, &data->double_indirect) +

					dbl_which_block);

	if (dbl_indir_block == NULL) {

		befs_error(sb, "%s couldn't read the "
@@ -499,7 +499,7 @@ befs_find_brun_dblindirect(struct super_block *sb, 
	}



	indir_block =

	    befs_bread(sb, iaddr2blockno(sb, &indir_run) + which_block);

	    sb_bread(sb, iaddr2blockno(sb, &indir_run) + which_block);

	if (indir_block == NULL) {

		befs_error(sb, "%s couldn't read the indirect block "

			   "at blockno %lu", __func__, (unsigned long)

fs/befs/io.c

+0 −24
Original line number Diff line number Diff line
@@ -59,27 +59,3 @@ befs_bread_iaddr(struct super_block *sb, befs_inode_addr iaddr) 
	befs_debug(sb, "<--- %s ERROR", __func__);

	return NULL;

}
 


struct buffer_head *

befs_bread(struct super_block *sb, befs_blocknr_t block)

{

	struct buffer_head *bh;



	befs_debug(sb, "---> Enter %s %lu", __func__, (unsigned long)block);



	bh = sb_bread(sb, block);



	if (bh == NULL) {

		befs_error(sb, "Failed to read block %lu",

			   (unsigned long)block);

		goto error;

	}



	befs_debug(sb, "<--- %s", __func__);



	return bh;



      error:

	befs_debug(sb, "<--- %s ERROR", __func__);

	return NULL;

}

fs/befs/io.h

+0 −2
Original line number Diff line number Diff line
@@ -5,5 +5,3 @@ 
struct buffer_head *befs_bread_iaddr(struct super_block *sb,

				     befs_inode_addr iaddr);

struct buffer_head *befs_bread(struct super_block *sb, befs_blocknr_t block);

fs/befs/linuxvfs.c

+1 −1
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ static struct inode *befs_iget(struct super_block *sb, unsigned long ino) 
		   befs_ino->i_inode_num.allocation_group,

		   befs_ino->i_inode_num.start, befs_ino->i_inode_num.len);



	bh = befs_bread(sb, inode->i_ino);

	bh = sb_bread(sb, inode->i_ino);

	if (!bh) {

		befs_error(sb, "unable to read inode block - "

			   "inode = %lu", inode->i_ino);