From patchwork Sat Jul 27 10:12:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Azat Khuzhin X-Patchwork-Id: 2834601 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 082EB9F4D4 for ; Sat, 27 Jul 2013 10:13:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1E1E520131 for ; Sat, 27 Jul 2013 10:13:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 507AD2012F for ; Sat, 27 Jul 2013 10:13:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751264Ab3G0KNH (ORCPT ); Sat, 27 Jul 2013 06:13:07 -0400 Received: from mail-lb0-f170.google.com ([209.85.217.170]:50350 "EHLO mail-lb0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751188Ab3G0KNE (ORCPT ); Sat, 27 Jul 2013 06:13:04 -0400 Received: by mail-lb0-f170.google.com with SMTP id u10so3087636lbi.29 for ; Sat, 27 Jul 2013 03:13:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=jnmPST5EmptQCMsCED2RbKUq1VW5hsE5qeMeRejJGOA=; b=LJzsiHuhiIJmhMljaCkfYkkghkKGdxSeDxVgFG8L8PP/z6EXg+YPyWzrwoJCH8K7sF IDUISfH9U95gdfdl4HjgE+oSeMJmzBfd8bZISgHJ28Vpys8KUDMBvkrKvyZTLJE4WVIm +Kqmtv97ql2DyqBC8IedM/E5UrFz36ss8ddjlLC4SKmo1kwhDbrXrX/LmqkZYw5ed8hQ /rJUAEPzZJ6M5iWgRV/PnXgylkA3vv08U8U+TXwl60Ax/GEqaPG3HZsa+B5FK8GOW2gm jKPF/1P3r0ZWFO3QxF1FtmgN+urotfXUEYy6GKIrtnd+iAcU0zOdrhnNc9wbTfcUOGqo aEMA== X-Received: by 10.152.18.229 with SMTP id z5mr6818195lad.84.1374919982153; Sat, 27 Jul 2013 03:13:02 -0700 (PDT) Received: from localhost ([188.134.22.24]) by mx.google.com with ESMTPSA id m1sm20330354lag.3.2013.07.27.03.13.00 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sat, 27 Jul 2013 03:13:01 -0700 (PDT) From: Azat Khuzhin To: linux-btrfs@vger.kernel.org Cc: chris.mason@fusionio.com, Azat Khuzhin , linux-kernel@vger.kernel.org (open list) Subject: [PATCH] btrfs: use list_for_each_entry_safe() when delete items Date: Sat, 27 Jul 2013 14:12:45 +0400 Message-Id: <1374919965-11690-1-git-send-email-a3at.mail@gmail.com> X-Mailer: git-send-email 1.7.10.4 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 Replace list_for_each_entry() by list_for_each_entry_safe() in __btrfs_close_devices() There is another place that delete items lock_stripe_add(), but there we don't need safe version, because after deleting we exit from loop. Signed-off-by: Azat Khuzhin Reviewed-by: Miao Xie --- fs/btrfs/volumes.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 78b8717..1d1b595 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -616,13 +616,13 @@ static void free_device(struct rcu_head *head) static int __btrfs_close_devices(struct btrfs_fs_devices *fs_devices) { - struct btrfs_device *device; + struct btrfs_device *device, *next; if (--fs_devices->opened > 0) return 0; mutex_lock(&fs_devices->device_list_mutex); - list_for_each_entry(device, &fs_devices->devices, dev_list) { + list_for_each_entry_safe(device, next, &fs_devices->devices, dev_list) { struct btrfs_device *new_device; struct rcu_string *name;