From patchwork Thu May 10 06:21:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Sandoval X-Patchwork-Id: 10391249 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 B631160153 for ; Thu, 10 May 2018 06:21:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A65FF288AD for ; Thu, 10 May 2018 06:21:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9AD0E288B6; Thu, 10 May 2018 06:21:36 +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=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID 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 40E7D288AD for ; Thu, 10 May 2018 06:21:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933819AbeEJGVe (ORCPT ); Thu, 10 May 2018 02:21:34 -0400 Received: from mail-pl0-f68.google.com ([209.85.160.68]:35021 "EHLO mail-pl0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756546AbeEJGVb (ORCPT ); Thu, 10 May 2018 02:21:31 -0400 Received: by mail-pl0-f68.google.com with SMTP id i5-v6so696726plt.2 for ; Wed, 09 May 2018 23:21:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osandov-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=7t5z6gkXPDJ0O1F6UB6G+py0OKn0xY7269sszmvPHcA=; b=JJkmOoj1vN5YpwNOzAv/5njYMhiTvavl/xk6TgDfxCvHYA51Br9fDUmISCSD02VzgC BWyRir29CWWqfYbIOHsU06xleZ+ogPZmt9gU3K6QmqTLXfjamqwIM3QqJ/GWVyhQsp9B nX6/U9yNpRBEkc9VtLShQicn26xvq6YDfJDgMg26ywL7sIPmOt6jHy7D/gnf0XfTOelK B9f/UbF/749R1a3JRIheRDhnlsn67sprEG9edB6vTJCDbrABj8eWRvuI9yKpOmTEoCo6 4XfVZT0LPkPqBhOK5kuAbCNGVDbjMhceMvcHt3XOwijLjZBitYiwFD+yE4FeLzINDDN1 HcVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=7t5z6gkXPDJ0O1F6UB6G+py0OKn0xY7269sszmvPHcA=; b=ftCu8InA7MGsO/gwDlSib9xG26cnsa5UB+I3YeFl0Z2srn+XW6M9bcFW4UvARpJIx0 HeIwHTCnvyuCYNFxX59vlCBfM8LRouwx2wXl/RozLQ6OVibHzMryUVUS+Kt0ITcSxc2a acBQi8fkN1I9BUWHfDFeJnlRx8xvdS+J6dm1/1mi8SA0rbzxryFqwlE2sAKF6RMVojjd Xt5uwIZlhsqwGyUdBp5pY78l24aBT6uumKYdfNamhqoOc4q9D0rhZGssHNo5KScEXv3L cQ2NkOmDgTwSlCEfj+MIi8JqwBQCOs0cobJ9bpZ/ltO+krZB8re3ZZNYByjTaMEaMp2F TnqA== X-Gm-Message-State: ALKqPwcHzPMTSLfDnYRWjziTEHo6N0983Njk1GMPbxo7zwaM/7ZW/W8K OxURJxHcb+wixXJrsZj09D/Cnl/yePY= X-Google-Smtp-Source: AB8JxZoobCNEe4vaUai3Pb7cWrzhuC0/kSHABYTnA5gZF6gfxglOqYWS2jNsoiV4TGySluCl8SjdCQ== X-Received: by 2002:a17:902:59ce:: with SMTP id d14-v6mr119606plj.253.1525933290211; Wed, 09 May 2018 23:21:30 -0700 (PDT) Received: from vader.thefacebook.com ([2620:10d:c090:180::1:65fc]) by smtp.gmail.com with ESMTPSA id 68-v6sm496206pff.35.2018.05.09.23.21.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 May 2018 23:21:29 -0700 (PDT) From: Omar Sandoval To: linux-btrfs@vger.kernel.org Cc: kernel-team@fb.com, Chris Mason , Josef Bacik Subject: [PATCH 05/10] Btrfs: don't release reserve or decrement orphan count if orphan item already existed Date: Wed, 9 May 2018 23:21:06 -0700 Message-Id: X-Mailer: git-send-email 2.17.0 In-Reply-To: References: In-Reply-To: References: 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 From: Omar Sandoval Currently, if btrfs_insert_orphan_item() fails, we release the reserved space and decrement root->orphan_inodes. However, we also ignore -EEXIST errors, so we still want the space reservation for when we delete the item, and we still need to count the orphan because we're still going to decrement root->orphan_inodes from btrfs_orphan_del() later. Fixes: 4ef31a45a009 ("Btrfs: fix the error handling wrt orphan items") Signed-off-by: Omar Sandoval Reviewed-by: Nikolay Borisov --- fs/btrfs/inode.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 1460823951d7..e77df96de642 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -3408,7 +3408,7 @@ int btrfs_orphan_add(struct btrfs_trans_handle *trans, /* insert an orphan item to track this unlinked file */ if (insert) { ret = btrfs_insert_orphan_item(trans, root, btrfs_ino(inode)); - if (ret) { + if (ret && ret != -EEXIST) { if (reserve) { clear_bit(BTRFS_INODE_ORPHAN_META_RESERVED, &inode->runtime_flags); @@ -3420,14 +3420,11 @@ int btrfs_orphan_add(struct btrfs_trans_handle *trans, * decrease ->orphan_inodes after everything is done. */ atomic_dec(&root->orphan_inodes); - if (ret != -EEXIST) { - clear_bit(BTRFS_INODE_HAS_ORPHAN_ITEM, - &inode->runtime_flags); - btrfs_abort_transaction(trans, ret); - return ret; - } + clear_bit(BTRFS_INODE_HAS_ORPHAN_ITEM, + &inode->runtime_flags); + btrfs_abort_transaction(trans, ret); + return ret; } - ret = 0; } return 0;