linux-btrfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Nikolay Borisov <nborisov@suse.com>
To: linux-btrfs@vger.kernel.org
Cc: Nikolay Borisov <nborisov@suse.com>
Subject: [PATCH 1/3] btrfs: Remove unnecessary btrfs_abort_transaction on transaction commit failure
Date: Wed, 27 Sep 2017 13:48:45 +0300	[thread overview]
Message-ID: <1506509327-18862-2-git-send-email-nborisov@suse.com> (raw)
In-Reply-To: <1506509327-18862-1-git-send-email-nborisov@suse.com>

If btrfs_transaction_commit fails it will proceed to call cleanup_transaction,
which in turn already does btrfs_abort_transaction. So let's remove the
unnecessary code duplication.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
---
 fs/btrfs/ioctl.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index d6715c2bcdc4..585111e055e0 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -5160,11 +5160,6 @@ static long _btrfs_ioctl_set_received_subvol(struct file *file,
 		}
 	}
 	ret = btrfs_commit_transaction(trans);
-	if (ret < 0) {
-		btrfs_abort_transaction(trans, ret);
-		goto out;
-	}
-
 out:
 	up_write(&fs_info->subvol_sem);
 	mnt_drop_write_file(file);
-- 
2.7.4


  reply	other threads:[~2017-09-27 10:48 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-27 10:48 [PATCH 0/3] Few transaction semantic fixes Nikolay Borisov
2017-09-27 10:48 ` Nikolay Borisov [this message]
2017-09-27 10:48 ` [PATCH 2/3] btrfs: Handle failure to add to add received uuid to uuid tree in _btrfs_ioctl_set_received_subvol Nikolay Borisov
2017-09-27 10:48 ` [PATCH 3/3] btrfs: Fix transaction abort during failure in btrfs_rm_dev_item Nikolay Borisov
2017-09-28  8:45 ` [PATCH v2 1/2] btrfs: Refactor transaction handling Nikolay Borisov
2017-09-28  8:45   ` [PATCH v2 2/2] btrfs: Fix transaction abort during failure in btrfs_rm_dev_item Nikolay Borisov
2017-10-06 16:14     ` David Sterba
2017-10-19 11:54     ` David Sterba
2017-10-19 13:26       ` Nikolay Borisov
2017-10-20  6:30       ` [PATCH v3] " Nikolay Borisov
2017-10-23  6:58         ` [PATCH v4] " Nikolay Borisov
2017-10-23 16:29           ` Edmund Nadolski
2017-10-30 15:02             ` David Sterba
2017-10-06 16:11   ` [PATCH v2 1/2] btrfs: Refactor transaction handling David Sterba

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1506509327-18862-2-git-send-email-nborisov@suse.com \
    --to=nborisov@suse.com \
    --cc=linux-btrfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).