From patchwork Mon May 15 18:57:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 9727769 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 83DE260231 for ; Mon, 15 May 2017 18:57:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 79D8627FA3 for ; Mon, 15 May 2017 18:57:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6EA582843B; Mon, 15 May 2017 18:57:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 13C6E27FA3 for ; Mon, 15 May 2017 18:57:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965952AbdEOS5Z (ORCPT ); Mon, 15 May 2017 14:57:25 -0400 Received: from mailrelay116.isp.belgacom.be ([195.238.20.143]:21199 "EHLO mailrelay116.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965928AbdEOS5W (ORCPT ); Mon, 15 May 2017 14:57:22 -0400 X-Belgacom-Dynamic: yes IronPort-PHdr: =?us-ascii?q?9a23=3ABsIqShfGbVcMOSu6qtE69x45lGMj4u6mDksu8pMi?= =?us-ascii?q?zoh2WeGdxc2zbR7h7PlgxGXEQZ/co6odzbGJ4+a9ASQp2tWojjMrSNR0TRgLiM?= =?us-ascii?q?EbzUQLIfWuLgnFFsPsdDEwB89YVVVorDmROElRH9viNRWJ+iXhpRZbIBj0NBJ0?= =?us-ascii?q?K+LpAcaSyp3vj6Hhs6HUNixMiSq0Z79/Nl2IrB/W/p0IgJFlArQ8zBrX5H9Jff?= =?us-ascii?q?lGg2RyKhSOnECvyN23+ctN+i5RsvRp2dRNXajgfq87BehWBT4oG3s29cvmqV/J?= =?us-ascii?q?QF3ctTMnTmwKn08QUED+5xbgU8K063Oiuw=3D=3D?= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A2AGBAAE+RlZ//gsQldcHAELAQUBgmpsK?= =?us-ascii?q?BqBLI52kRgBkGqEX4IPIYYDhTVBFwEBAQEBAQEBAQEBaiiCMwUBHgEFgmkvI4E?= =?us-ascii?q?aJBOKFhGuWTqEEYcahl+NBIJKBZ4Kkw4NkWtIk3sgATaBCk8eGIRtAQtEHIFlP?= =?us-ascii?q?jaHEIFPAQEB?= X-IPAS-Result: =?us-ascii?q?A2AGBAAE+RlZ//gsQldcHAELAQUBgmpsKBqBLI52kRgBkGq?= =?us-ascii?q?EX4IPIYYDhTVBFwEBAQEBAQEBAQEBaiiCMwUBHgEFgmkvI4EaJBOKFhGuWTqEE?= =?us-ascii?q?Ycahl+NBIJKBZ4Kkw4NkWtIk3sgATaBCk8eGIRtAQtEHIFlPjaHEIFPAQEB?= Received: from 248.44-66-87.adsl-dyn.isp.belgacom.be (HELO localhost.localdomain) ([87.66.44.248]) by relay.skynet.be with ESMTP; 15 May 2017 20:57:20 +0200 From: Fabian Frederick To: Alexander Viro Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, fabf@skynet.be Subject: [PATCH 2/3 linux-next] fs/affs: remove affs_set_blocksize() Date: Mon, 15 May 2017 20:57:18 +0200 Message-Id: <20170515185718.4918-1-fabf@skynet.be> X-Mailer: git-send-email 2.9.3 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP That function was only calling sb_set_blocksize() Signed-off-by: Fabian Frederick --- fs/affs/affs.h | 5 ----- fs/affs/super.c | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) 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