From patchwork Mon Apr 27 11:51:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Beata Michalska X-Patchwork-Id: 6279441 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A581BBF4A6 for ; Mon, 27 Apr 2015 11:56:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A5B282045E for ; Mon, 27 Apr 2015 11:56:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8FB7F20459 for ; Mon, 27 Apr 2015 11:56:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932739AbbD0L4v (ORCPT ); Mon, 27 Apr 2015 07:56:51 -0400 Received: from mailout4.w1.samsung.com ([210.118.77.14]:43116 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932729AbbD0L4p (ORCPT ); Mon, 27 Apr 2015 07:56:45 -0400 Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NNG002YKRUF1J70@mailout4.w1.samsung.com>; Mon, 27 Apr 2015 12:56:39 +0100 (BST) X-AuditID: cbfec7f5-f794b6d000001495-bb-553e23fb4409 Received: from eusync2.samsung.com ( [203.254.199.212]) by eucpsbgm2.samsung.com (EUCPMTA) with SMTP id B3.9D.05269.BF32E355; Mon, 27 Apr 2015 12:56:43 +0100 (BST) Received: from AMDC2203.DIGITAL.local ([106.120.53.25]) by eusync2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NNG003ZWRM9W840@eusync2.samsung.com>; Mon, 27 Apr 2015 12:56:39 +0100 (BST) From: Beata Michalska To: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-api@vger.kernel.org Cc: jack@suse.cz, tytso@mit.edu, adilger.kernel@dilger.ca, hughd@google.com, lczerner@redhat.com, hch@infradead.org, linux-ext4@vger.kernel.org, linux-mm@kvack.org, kyungmin.park@samsung.com, kmpark@infradead.org Subject: [RFC v2 2/4] ext4: Add helper function to mark group as corrupted Date: Mon, 27 Apr 2015 13:51:42 +0200 Message-id: <1430135504-24334-3-git-send-email-b.michalska@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1430135504-24334-1-git-send-email-b.michalska@samsung.com> References: <1430135504-24334-1-git-send-email-b.michalska@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrELMWRmVeSWpSXmKPExsVy+t/xK7q/le1CDV68t7D4+qWDxeL0hEVM Fk8/9bFYzJ7ezGRx6/IqFouzTW/YLZY92Mxisfl7B5vFzHl32Cz27D3JYnF51xw2i3tr/rNa tPb8ZHfg9WjZXO6xYFOpx+YVWh6bPk1i92g6c5TZ4/2+q2wefVtWMXqcWXCE3ePzJrkAzigu m5TUnMyy1CJ9uwSujH1LH7IU/FOu2Np8gamBsUmui5GTQ0LAROLEhFPMELaYxIV769m6GLk4 hASWMkpsOTuRHcJpZJLY8+IMO0gVm4C+xKsZK5lAbBGBGImDu3pYQIqYBW4wSsw4eI4RJCEs 4CXx7PNTNhCbRUBVYtbn72BxXgF3iS8fbrN2MXIArVOQmDPJBiTMKeAhsWbGW2aQsBBQyaKX KhMYeRcwMqxiFE0tTS4oTkrPNdIrTswtLs1L10vOz93ECAnZrzsYlx6zOsQowMGoxMOrMMM2 VIg1say4MvcQowQHs5II7wElu1Ah3pTEyqrUovz4otKc1OJDjNIcLErivDN3vQ8REkhPLEnN Tk0tSC2CyTJxcEo1MB5uSwlzXBeSw8ElZrj3E+ts3uh9WplbN7LvPdUrEvIqU2JFlG3N80f1 89kqXv95FhBxL3/2Jpa0sx7NXitTNj3/43ZnQkLSNR+Bqrj1KUWFL4W9vy270FNz68HtaM+6 8hO1fkVKbJPeh4mY3xfOmi2tU2mbO3/J11UdK2dcmVD7W33qVNvwrUosxRmJhlrMRcWJAJo6 +IpVAgAA Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add ext4_mark_group_corrupted helper function to simplify the code and to keep the logic in one place. Signed-off-by: Beata Michalska --- fs/ext4/balloc.c | 15 +++------------ fs/ext4/ext4.h | 9 +++++++++ fs/ext4/ialloc.c | 5 +---- fs/ext4/mballoc.c | 11 ++--------- 4 files changed, 15 insertions(+), 25 deletions(-) diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c index 83a6f49..e95b27a 100644 --- a/fs/ext4/balloc.c +++ b/fs/ext4/balloc.c @@ -193,10 +193,7 @@ static int ext4_init_block_bitmap(struct super_block *sb, * essentially implementing a per-group read-only flag. */ if (!ext4_group_desc_csum_verify(sb, block_group, gdp)) { grp = ext4_get_group_info(sb, block_group); - if (!EXT4_MB_GRP_BBITMAP_CORRUPT(grp)) - percpu_counter_sub(&sbi->s_freeclusters_counter, - grp->bb_free); - set_bit(EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT, &grp->bb_state); + ext4_mark_group_corrupted(sbi, grp); if (!EXT4_MB_GRP_IBITMAP_CORRUPT(grp)) { int count; count = ext4_free_inodes_count(sb, gdp); @@ -379,20 +376,14 @@ static void ext4_validate_block_bitmap(struct super_block *sb, ext4_unlock_group(sb, block_group); ext4_error(sb, "bg %u: block %llu: invalid block bitmap", block_group, blk); - if (!EXT4_MB_GRP_BBITMAP_CORRUPT(grp)) - percpu_counter_sub(&sbi->s_freeclusters_counter, - grp->bb_free); - set_bit(EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT, &grp->bb_state); + ext4_mark_group_corrupted(sbi, grp); return; } if (unlikely(!ext4_block_bitmap_csum_verify(sb, block_group, desc, bh))) { ext4_unlock_group(sb, block_group); ext4_error(sb, "bg %u: bad block bitmap checksum", block_group); - if (!EXT4_MB_GRP_BBITMAP_CORRUPT(grp)) - percpu_counter_sub(&sbi->s_freeclusters_counter, - grp->bb_free); - set_bit(EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT, &grp->bb_state); + ext4_mark_group_corrupted(sbi, grp); return; } set_buffer_verified(bh); diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index f63c3d5..163afe2 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -2535,6 +2535,15 @@ static inline spinlock_t *ext4_group_lock_ptr(struct super_block *sb, return bgl_lock_ptr(EXT4_SB(sb)->s_blockgroup_lock, group); } +static inline +void ext4_mark_group_corrupted(struct ext4_sb_info *sbi, + struct ext4_group_info *grp) +{ + if (!EXT4_MB_GRP_BBITMAP_CORRUPT(grp)) + percpu_counter_sub(&sbi->s_freeclusters_counter, grp->bb_free); + set_bit(EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT, &grp->bb_state); +} + /* * Returns true if the filesystem is busy enough that attempts to * access the block group locks has run into contention. diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c index ac644c3..ebe0499 100644 --- a/fs/ext4/ialloc.c +++ b/fs/ext4/ialloc.c @@ -79,10 +79,7 @@ static unsigned ext4_init_inode_bitmap(struct super_block *sb, if (!ext4_group_desc_csum_verify(sb, block_group, gdp)) { ext4_error(sb, "Checksum bad for group %u", block_group); grp = ext4_get_group_info(sb, block_group); - if (!EXT4_MB_GRP_BBITMAP_CORRUPT(grp)) - percpu_counter_sub(&sbi->s_freeclusters_counter, - grp->bb_free); - set_bit(EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT, &grp->bb_state); + ext4_mark_group_corrupted(sbi, grp); if (!EXT4_MB_GRP_IBITMAP_CORRUPT(grp)) { int count; count = ext4_free_inodes_count(sb, gdp); diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 8d1e602..24a4b6d 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -760,10 +760,7 @@ void ext4_mb_generate_buddy(struct super_block *sb, * corrupt and update bb_free using bitmap value */ grp->bb_free = free; - if (!EXT4_MB_GRP_BBITMAP_CORRUPT(grp)) - percpu_counter_sub(&sbi->s_freeclusters_counter, - grp->bb_free); - set_bit(EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT, &grp->bb_state); + ext4_mark_group_corrupted(sbi, grp); } mb_set_largest_free_order(sb, grp); @@ -1448,12 +1445,8 @@ static void mb_free_blocks(struct inode *inode, struct ext4_buddy *e4b, "freeing already freed block " "(bit %u); block bitmap corrupt.", block); - if (!EXT4_MB_GRP_BBITMAP_CORRUPT(e4b->bd_info)) - percpu_counter_sub(&sbi->s_freeclusters_counter, - e4b->bd_info->bb_free); /* Mark the block group as corrupt. */ - set_bit(EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT, - &e4b->bd_info->bb_state); + ext4_mark_group_corrupted(sbi, e4b->bd_info); mb_regenerate_buddy(e4b); goto done; }