From patchwork Thu Jun 23 13:01:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 9195087 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 3278D608A0 for ; Thu, 23 Jun 2016 13:01:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 224D028455 for ; Thu, 23 Jun 2016 13:01:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 16B6C28464; Thu, 23 Jun 2016 13:01:32 +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, UNPARSEABLE_RELAY 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 22B7A28455 for ; Thu, 23 Jun 2016 13:01:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752264AbcFWNBM (ORCPT ); Thu, 23 Jun 2016 09:01:12 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:40265 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752053AbcFWNBL (ORCPT ); Thu, 23 Jun 2016 09:01:11 -0400 Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u5ND16Yf009022 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 23 Jun 2016 13:01:06 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by userv0021.oracle.com (8.13.8/8.13.8) with ESMTP id u5ND15fK013135 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 23 Jun 2016 13:01:06 GMT Received: from abhmp0011.oracle.com (abhmp0011.oracle.com [141.146.116.17]) by aserv0122.oracle.com (8.13.8/8.13.8) with ESMTP id u5ND13Pv019172; Thu, 23 Jun 2016 13:01:04 GMT Received: from arch2.sg.oracle.com (/10.186.101.143) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 23 Jun 2016 06:01:03 -0700 From: Anand Jain To: linux-btrfs@vger.kernel.org Cc: clm@fb.com, dsterba@suse.cz Subject: [PATCH RFC] don't background blkdev_put() Date: Thu, 23 Jun 2016 21:01:53 +0800 Message-Id: <1466686913-7832-1-git-send-email-anand.jain@oracle.com> X-Mailer: git-send-email 2.7.0 X-Source-IP: userv0021.oracle.com [156.151.31.71] Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index e0ad29d6fe9a..63036702ea18 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -834,10 +834,6 @@ static void __free_device(struct work_struct *work) struct btrfs_device *device; device = container_of(work, struct btrfs_device, rcu_work); - - if (device->bdev) - blkdev_put(device->bdev, device->mode); - rcu_string_free(device->name); kfree(device); } @@ -874,6 +870,8 @@ static void btrfs_close_one_device(struct btrfs_device *device) sync_blockdev(device->bdev); invalidate_bdev(device->bdev); } + if (device->bdev) + blkdev_put(device->bdev, device->mode); new_device = btrfs_alloc_device(NULL, &device->devid, device->uuid); @@ -1931,6 +1929,13 @@ int btrfs_rm_device(struct btrfs_root *root, char *device_path, u64 devid) btrfs_sysfs_rm_device_link(root->fs_info->fs_devices, device); } + if (device->bdev && device->writeable) { + sync_blockdev(device->bdev); + invalidate_bdev(device->bdev); + } + if (device->bdev) + blkdev_put(device->bdev, device->mode); + call_rcu(&device->rcu, free_device); num_devices = btrfs_super_num_devices(root->fs_info->super_copy) - 1; @@ -2024,6 +2029,13 @@ void btrfs_rm_dev_replace_free_srcdev(struct btrfs_fs_info *fs_info, /* zero out the old super if it is writable */ btrfs_scratch_superblocks(srcdev->bdev, srcdev->name->str); } + + if (srcdev->bdev && srcdev->writeable) { + sync_blockdev(srcdev->bdev); + invalidate_bdev(srcdev->bdev); + } + if (srcdev->bdev) + blkdev_put(srcdev->bdev, srcdev->mode); call_rcu(&srcdev->rcu, free_device); /* @@ -2079,6 +2091,12 @@ void btrfs_destroy_dev_replace_tgtdev(struct btrfs_fs_info *fs_info, * the device_list_mutex lock. */ btrfs_scratch_superblocks(tgtdev->bdev, tgtdev->name->str); + if (tgtdev->bdev && tgtdev->writeable) { + sync_blockdev(tgtdev->bdev); + invalidate_bdev(tgtdev->bdev); + } + if (tgtdev->bdev) + blkdev_put(tgtdev->bdev, tgtdev->mode); call_rcu(&tgtdev->rcu, free_device); }