From 541c9ba34a6c3f3e154717bed17bd363e52d97f3 Mon Sep 17 00:00:00 2001 From: Wang Shilong Date: Sun, 14 Apr 2013 14:08:49 +0000 Subject: [PATCH] --- yaml --- r: 374870 b: refs/heads/master c: 98ad43be0a7ec87962b194a09ae9514bf2443f35 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/btrfs/transaction.c | 14 ++------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 04caa9a2218d..ce27c7b1de0a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 47fb091fb787420cd195e66f162737401cce023f +refs/heads/master: 98ad43be0a7ec87962b194a09ae9514bf2443f35 diff --git a/trunk/fs/btrfs/transaction.c b/trunk/fs/btrfs/transaction.c index a5764aeb4549..de774580134f 100644 --- a/trunk/fs/btrfs/transaction.c +++ b/trunk/fs/btrfs/transaction.c @@ -707,23 +707,13 @@ static int __btrfs_end_transaction(struct btrfs_trans_handle *trans, int btrfs_end_transaction(struct btrfs_trans_handle *trans, struct btrfs_root *root) { - int ret; - - ret = __btrfs_end_transaction(trans, root, 0); - if (ret) - return ret; - return 0; + return __btrfs_end_transaction(trans, root, 0); } int btrfs_end_transaction_throttle(struct btrfs_trans_handle *trans, struct btrfs_root *root) { - int ret; - - ret = __btrfs_end_transaction(trans, root, 1); - if (ret) - return ret; - return 0; + return __btrfs_end_transaction(trans, root, 1); } int btrfs_end_transaction_dmeta(struct btrfs_trans_handle *trans,