From patchwork Mon Mar 9 22:38:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 5970171 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 46C729F444 for ; Mon, 9 Mar 2015 17:13:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6628720260 for ; Mon, 9 Mar 2015 17:13:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8CCEA20259 for ; Mon, 9 Mar 2015 17:13:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753652AbbCIRK7 (ORCPT ); Mon, 9 Mar 2015 13:10:59 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:20362 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753572AbbCIRK5 (ORCPT ); Mon, 9 Mar 2015 13:10:57 -0400 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id t29HAr8K022738 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 9 Mar 2015 17:10:54 GMT Received: from userz7021.oracle.com (userz7021.oracle.com [156.151.31.85]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id t29HAraB004138 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Mon, 9 Mar 2015 17:10:53 GMT Received: from abhmp0004.oracle.com (abhmp0004.oracle.com [141.146.116.10]) by userz7021.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id t29HArmA004127; Mon, 9 Mar 2015 17:10:53 GMT Received: from OL.sg.oracle.com (/10.186.101.34) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 09 Mar 2015 10:10:52 -0700 From: Anand Jain To: linux-btrfs@vger.kernel.org Cc: dsterba@suse.cz Subject: [PATCH 23/26] Btrfs: free the stale device Date: Tue, 10 Mar 2015 06:38:41 +0800 Message-Id: <1425940724-7744-24-git-send-email-anand.jain@oracle.com> X-Mailer: git-send-email 2.0.0.153.g79dcccc In-Reply-To: <1425940724-7744-1-git-send-email-anand.jain@oracle.com> References: <1425940724-7744-1-git-send-email-anand.jain@oracle.com> X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00, DATE_IN_FUTURE_03_06, RCVD_IN_DNSWL_HI,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham 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 Signed-off-by: Anand Jain --- fs/btrfs/volumes.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 58232bc..452abb3 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -446,6 +446,55 @@ static void pending_bios_fn(struct btrfs_work *work) run_scheduled_bios(device); } + +void btrfs_free_stale_device(struct btrfs_device *cur_dev) +{ + int del = 0; + struct btrfs_fs_devices *fs_devs; + struct btrfs_device *dev; + + list_for_each_entry(fs_devs, &fs_uuids, list) { + if (fs_devs->opened) + continue; + if (fs_devs->seeding) + continue; + list_for_each_entry(dev, &fs_devs->devices, dev_list) { + if (dev == cur_dev) + continue; + + /* + * Todo: This won't be enough. What if same device + * comes back with new uuid and with its mapper path? + * But for now, this does helps as mostly an admin will + * use either mapper or non mapper path throughout. + */ + + if (!strcmp(rcu_str_deref(dev->name), + rcu_str_deref(cur_dev->name))) { + del = 1; + break; + } + } + if (del) { + /* delete the stale */ + if (fs_devs->num_devices == 1) { + btrfs_kobj_rm_device(fs_devs, dev); + btrfs_sysfs_remove_fsid(fs_devs); + list_del(&fs_devs->list); + free_fs_devices(fs_devs); + } else { + fs_devs->num_devices--; + btrfs_kobj_rm_device(fs_devs, dev); + list_del(&dev->dev_list); + rcu_string_free(dev->name); + kfree(dev); + } + break; + } + } + return; +} + /* * Add new device to list of registered devices * @@ -561,6 +610,8 @@ static noinline int device_list_add(const char *path, if (!fs_devices->opened) device->generation = found_transid; + btrfs_free_stale_device(device); + *fs_devices_ret = fs_devices; return ret;