From patchwork Tue Sep 29 11:00:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 263016 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7EAEAC4727C for ; Tue, 29 Sep 2020 12:21:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2CAB62076A for ; Tue, 29 Sep 2020 12:21:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601382094; bh=/pWMFgT0SO8Kh1wFe+/yR8VznL9o+NPNMCq3svQ0xRM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=pvbyge1IGP87/1pJIZh2YNO3wlSHg+g+1Va0yNmVwCrriwIPOQZr45vlqQ++hLcpT 1F+o9mYoUwgs6CWNjanIGJ+XLgr6bUQXaMcXPcuxjLGrdo8khwPsKLSVPTPlMiEK2h Nw8LHtyNbmqwPOA7uhK4SaySJ5oFE9Fef5JScQWE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732381AbgI2MVc (ORCPT ); Tue, 29 Sep 2020 08:21:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:47764 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729292AbgI2LfU (ORCPT ); Tue, 29 Sep 2020 07:35:20 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4D34323D24; Tue, 29 Sep 2020 11:29:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601378970; bh=/pWMFgT0SO8Kh1wFe+/yR8VznL9o+NPNMCq3svQ0xRM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H7ygq+RcICKDUW4w/pOE7HAL2UDLG13WMA1kjVPaIg4DwGpC/0u4RvqxwOsjB4Wb7 IBeBkVdT4Pcq6jFi3eSlo4QEswk/smNcT/GB9O/Iplc1FLX6qJKKZsbeq1mV4DDTgT ftur+o4fBgW6i5MEVagYTUI+EFlG6a35kd+KqTY8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, David Sterba , Sasha Levin Subject: [PATCH 4.19 176/245] btrfs: dont force read-only after error in drop snapshot Date: Tue, 29 Sep 2020 13:00:27 +0200 Message-Id: <20200929105955.540200137@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200929105946.978650816@linuxfoundation.org> References: <20200929105946.978650816@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: David Sterba [ Upstream commit 7c09c03091ac562ddca2b393e5d65c1d37da79f1 ] Deleting a subvolume on a full filesystem leads to ENOSPC followed by a forced read-only. This is not a transaction abort and the filesystem is otherwise ok, so the error should be just propagated to the callers. This is caused by unnecessary call to btrfs_handle_fs_error for all errors, except EAGAIN. This does not make sense as the standard transaction abort mechanism is in btrfs_drop_snapshot so all relevant failures are handled. Originally in commit cb1b69f4508a ("Btrfs: forced readonly when btrfs_drop_snapshot() fails") there was no return value at all, so the btrfs_std_error made some sense but once the error handling and propagation has been implemented we don't need it anymore. Signed-off-by: David Sterba Signed-off-by: Sasha Levin --- fs/btrfs/extent-tree.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 319a89d4d0735..ce5e0f6c6af4f 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -9098,8 +9098,6 @@ out: */ if (!for_reloc && !root_dropped) btrfs_add_dead_root(root); - if (err && err != -EAGAIN) - btrfs_handle_fs_error(fs_info, err, NULL); return err; }