[2/3,linux-next] fs/affs: remove affs_set_blocksize()

Commit Message

Fabian Frederick May 15, 2017, 6:57 p.m. UTC

That function was only calling sb_set_blocksize()

Signed-off-by: Fabian Frederick <[e-mail]>
---
 fs/affs/affs.h  | 5 -----
 fs/affs/super.c | 4 ++--
 2 files changed, 2 insertions(+), 7 deletions(-)

Patch

diff --git a/fs/affs/affs.h b/fs/affs/affs.h
index 87b17b5..fd99f28 100644
--- a/fs/affs/affs.h
+++ b/fs/affs/affs.h
@@ -219,11 +219,6 @@  static inline bool affs_validblock(struct super_block *sb, int block)
 	       block < AFFS_SB(sb)->s_partition_size);
 }
 
-static inline void
-affs_set_blocksize(struct super_block *sb, int size)
-{
-	sb_set_blocksize(sb, size);
-}
 static inline struct buffer_head *
 affs_bread(struct super_block *sb, int block)
 {
diff --git a/fs/affs/super.c b/fs/affs/super.c
index c2c27a8..2c0e607 100644
--- a/fs/affs/super.c
+++ b/fs/affs/super.c
@@ -357,7 +357,7 @@  static int affs_fill_super(struct super_block *sb, void *data, int silent)
 	size = i_size_read(sb->s_bdev->bd_inode) >> 9;
 	pr_debug("initial blocksize=%d, #blocks=%d\n", 512, size);
 
-	affs_set_blocksize(sb, PAGE_SIZE);
+	sb_set_blocksize(sb, PAGE_SIZE);
 	/* Try to find root block. Its location depends on the block size. */
 
 	i = bdev_logical_block_size(sb->s_bdev);
@@ -372,7 +372,7 @@  static int affs_fill_super(struct super_block *sb, void *data, int silent)
 		if (root_block < 0)
 			sbi->s_root_block = (reserved + size - 1) / 2;
 		pr_debug("setting blocksize to %d\n", blocksize);
-		affs_set_blocksize(sb, blocksize);
+		sb_set_blocksize(sb, blocksize);
 		sbi->s_partition_size = size;
 
 		/* The root block location that was calculated above is not