The patch titled
Subject: fs: befs: replace befs_bread by sb_bread
has been added to the -mm tree. Its filename is
fs-befs-replace-befs_bread-by-sb_bread.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/fs-befs-replace-befs_bread-by-sb_bread.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/fs-befs-replace-befs_bread-by-sb_bread.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Salah Triki <salah.triki@xxxxxxxxx>
Subject: 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@xxxxxxxxx
Signed-off-by: Salah Triki <salah.triki@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/befs/datastream.c | 6 +++---
fs/befs/io.c | 24 ------------------------
fs/befs/io.h | 2 --
fs/befs/linuxvfs.c | 2 +-
4 files changed, 4 insertions(+), 30 deletions(-)
diff -puN fs/befs/datastream.c~fs-befs-replace-befs_bread-by-sb_bread fs/befs/datastream.c
--- a/fs/befs/datastream.c~fs-befs-replace-befs_bread-by-sb_bread
+++ a/fs/befs/datastream.c
@@ -326,7 +326,7 @@ befs_find_brun_indirect(struct super_blo
/* 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_
}
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_
}
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)
diff -puN fs/befs/io.c~fs-befs-replace-befs_bread-by-sb_bread fs/befs/io.c
--- a/fs/befs/io.c~fs-befs-replace-befs_bread-by-sb_bread
+++ a/fs/befs/io.c
@@ -59,27 +59,3 @@ befs_bread_iaddr(struct super_block *sb,
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;
-}
diff -puN fs/befs/io.h~fs-befs-replace-befs_bread-by-sb_bread fs/befs/io.h
--- a/fs/befs/io.h~fs-befs-replace-befs_bread-by-sb_bread
+++ a/fs/befs/io.h
@@ -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);
-
diff -puN fs/befs/linuxvfs.c~fs-befs-replace-befs_bread-by-sb_bread fs/befs/linuxvfs.c
--- a/fs/befs/linuxvfs.c~fs-befs-replace-befs_bread-by-sb_bread
+++ a/fs/befs/linuxvfs.c
@@ -318,7 +318,7 @@ static struct inode *befs_iget(struct su
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);
_
Patches currently in -mm which might be from salah.triki@xxxxxxxxx are
fs-befs-replace-befs_bread-by-sb_bread.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
