From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com ([209.132.183.28]:44297 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754826AbcCBTCC (ORCPT ); Wed, 2 Mar 2016 14:02:02 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id B05982566 for ; Wed, 2 Mar 2016 19:02:02 +0000 (UTC) From: Frank Sorenson To: linux-fsdevel@vger.kernel.org Cc: dwysocha@redhat.com, lvaz@redhat.com Subject: [PATCH 2/5] fs/block_dev.c: simplify freeze_bdev() and thaw_bdev() exit handling Date: Wed, 2 Mar 2016 13:01:56 -0600 Message-Id: <1456945319-16283-3-git-send-email-sorenson@redhat.com> In-Reply-To: <1456945319-16283-1-git-send-email-sorenson@redhat.com> References: <1456945319-16283-1-git-send-email-sorenson@redhat.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: Change freeze_bdev() and thaw_bdev() to have a common exit Signed-off-by: Frank Sorenson --- fs/block_dev.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/fs/block_dev.c b/fs/block_dev.c index 826b164..1207f40 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -237,8 +237,7 @@ struct super_block *freeze_bdev(struct block_device *bdev) */ sb = get_super(bdev); drop_super(sb); - mutex_unlock(&bdev->bd_fsfreeze_mutex); - return sb; + goto out_unlock; } sb = get_active_super(bdev); @@ -251,12 +250,13 @@ struct super_block *freeze_bdev(struct block_device *bdev) if (error) { deactivate_super(sb); bdev->bd_fsfreeze_count--; - mutex_unlock(&bdev->bd_fsfreeze_mutex); - return ERR_PTR(error); + sb = ERR_PTR(error); + goto out_unlock; } deactivate_super(sb); - out: +out: sync_blockdev(bdev); +out_unlock: mutex_unlock(&bdev->bd_fsfreeze_mutex); return sb; /* thaw_bdev releases s->s_umount */ } @@ -288,14 +288,11 @@ int thaw_bdev(struct block_device *bdev, struct super_block *sb) error = sb->s_op->thaw_super(sb); else error = thaw_super(sb); - if (error) { + if (error) bdev->bd_fsfreeze_count++; - mutex_unlock(&bdev->bd_fsfreeze_mutex); - return error; - } out: mutex_unlock(&bdev->bd_fsfreeze_mutex); - return 0; + return error; } EXPORT_SYMBOL(thaw_bdev); -- 1.8.3.1