From patchwork Tue Jun 30 04:15:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Davide Italiano X-Patchwork-Id: 6692941 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 2B8D3C05AC for ; Tue, 30 Jun 2015 04:16:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 37E072060A for ; Tue, 30 Jun 2015 04:16:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 509B520609 for ; Tue, 30 Jun 2015 04:16:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751056AbbF3EPY (ORCPT ); Tue, 30 Jun 2015 00:15:24 -0400 Received: from mail-pd0-f180.google.com ([209.85.192.180]:32807 "EHLO mail-pd0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750803AbbF3EPW (ORCPT ); Tue, 30 Jun 2015 00:15:22 -0400 Received: by pdjd13 with SMTP id d13so3556483pdj.0 for ; Mon, 29 Jun 2015 21:15:22 -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:in-reply-to:references; bh=McwHATY0T9gPvrK3YHCgEkZvGg8kG+klf5sAgx87B1I=; b=gK2bBKAo75D3oWfYE69d8eARiuV8k+24rwf6nEaRtQ8/i6xE5s5kEJ3p9NWx5B7u4L BIFNnO7s//DCsLcvh+PbBTEz+rCgEeV3BIqxYTiO1o4h1BnhoRT/haH/bCVh7NDdrz9Y mMi7OAzfIOnE2+c9+MGHVDIqwmI+ofNxia5ihIzN70TlFvkxk3SD32TV5nqaWdELN87E obquc0rxzws8SDP9vn7RET411i0jIj/XEDVs973olrI5d0ltkw7hADOvHp4L9AMqqmPh fHVbtIHFg2grl/zme2NnHgNmjxkqlAnWErUDpFlXROHQ7UeDZ07/fRBgzVRzjd8tzEB3 fJrQ== X-Received: by 10.68.190.41 with SMTP id gn9mr38326676pbc.113.1435637722007; Mon, 29 Jun 2015 21:15:22 -0700 (PDT) Received: from localhost.localdomain.localdomain (c-24-7-63-120.hsd1.ca.comcast.net. [24.7.63.120]) by mx.google.com with ESMTPSA id ja1sm43782590pbc.51.2015.06.29.21.15.20 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jun 2015 21:15:20 -0700 (PDT) From: "Davide C. C. Italiano" To: linux-btrfs@vger.kernel.org Cc: fdmanana@gmail.com, Davide Italiano Subject: [PATCH 2/2] [btrfs] btrfs_rename(): don't ignore btrfs_end_transaction() return Date: Tue, 30 Jun 2015 00:15:15 -0400 Message-Id: <1435637715-16332-1-git-send-email-dccitaliano@gmail.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1435528041-20878-3-git-send-email-dccitaliano@gmail.com> References: <1435528041-20878-3-git-send-email-dccitaliano@gmail.com> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-7.4 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 From: Davide Italiano btrfs_end_transaction() can return an error -- this happens, e.g. if it tries to commit and the transaction was aborted in the meanhwile. Swallowing the error is wrong, so explicitly return it. Signed-off-by: Davide Italiano --- fs/btrfs/inode.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 59c475c..61b26be 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -9199,7 +9199,8 @@ static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry, btrfs_end_log_trans(root); } out_fail: - btrfs_end_transaction(trans, root); + if (!ret) + ret = btrfs_end_transaction(trans, root); out_notrans: if (old_ino == BTRFS_FIRST_FREE_OBJECTID) up_read(&root->fs_info->subvol_sem);