All of lore.kernel.org
 help / color / mirror / Atom feed
From: xiakaixu1987@gmail.com
To: linux-xfs@vger.kernel.org
Cc: darrick.wong@oracle.com, Kaixu Xia <kaixuxia@tencent.com>
Subject: [PATCH] xfs: remove the unnecessary variable error in xfs_trans_unreserve_and_mod_sb
Date: Wed, 16 Sep 2020 19:19:09 +0800	[thread overview]
Message-ID: <1600255152-16086-7-git-send-email-kaixuxia@tencent.com> (raw)
In-Reply-To: <1600255152-16086-1-git-send-email-kaixuxia@tencent.com>

From: Kaixu Xia <kaixuxia@tencent.com>

We can do the assert directly for the return value of xfs_mod_fdblocks()
function, and the variable error is unnecessary, so remove it.

Signed-off-by: Kaixu Xia <kaixuxia@tencent.com>
---
 fs/xfs/xfs_trans.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c
index d33d0ba6f3bd..caa207220e2c 100644
--- a/fs/xfs/xfs_trans.c
+++ b/fs/xfs/xfs_trans.c
@@ -573,7 +573,6 @@ xfs_trans_unreserve_and_mod_sb(
 	int64_t			rtxdelta = 0;
 	int64_t			idelta = 0;
 	int64_t			ifreedelta = 0;
-	int			error;
 
 	/* calculate deltas */
 	if (tp->t_blk_res > 0)
@@ -596,10 +595,8 @@ xfs_trans_unreserve_and_mod_sb(
 	}
 
 	/* apply the per-cpu counters */
-	if (blkdelta) {
-		error = xfs_mod_fdblocks(mp, blkdelta, rsvd);
-		ASSERT(!error);
-	}
+	if (blkdelta)
+		ASSERT(!xfs_mod_fdblocks(mp, blkdelta, rsvd));
 
 	if (idelta) {
 		percpu_counter_add_batch(&mp->m_icount, idelta,
-- 
2.20.0


  parent reply	other threads:[~2020-09-16 16:22 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-16 11:19 [RFC PATCH 0/9]xfs: random fixes and code cleanup xiakaixu1987
2020-09-16 11:19 ` [PATCH] xfs: remove the unused SYNCHRONIZE macro xiakaixu1987
2020-09-16 21:28   ` Darrick J. Wong
2020-09-17  8:03   ` Christoph Hellwig
2020-09-16 11:19 ` [PATCH] xfs: use the existing type definition for di_projid xiakaixu1987
2020-09-16 21:30   ` Darrick J. Wong
2020-09-17  8:06   ` Christoph Hellwig
2020-09-16 11:19 ` [PATCH] xfs: remove the unnecessary xfs_dqid_t type cast xiakaixu1987
2020-09-16 21:30   ` Darrick J. Wong
2020-09-17  8:07   ` Christoph Hellwig
2020-09-16 11:19 ` [PATCH] xfs: do the assert for all the log done items in xfs_trans_cancel xiakaixu1987
2020-09-17  0:10   ` Darrick J. Wong
2020-09-17  8:06     ` kaixuxia
2020-09-17  8:08     ` Christoph Hellwig
2020-09-16 11:19 ` [PATCH] xfs: add the XFS_ITEM_LOG_INTENT flag to mark the log intent item xiakaixu1987
2020-09-16 11:19 ` xiakaixu1987 [this message]
2020-09-16 16:45   ` [PATCH] xfs: remove the unnecessary variable error in xfs_trans_unreserve_and_mod_sb Darrick J. Wong
2020-09-17  6:47     ` kaixuxia
2020-09-16 11:19 ` [PATCH] xfs: remove the repeated crc verification in xfs_attr3_rmt_verify xiakaixu1987
2020-09-16 18:45   ` Darrick J. Wong
2020-09-17  7:03     ` kaixuxia
2020-09-16 11:19 ` [PATCH] xfs: cleanup the useless backslash in xfs_attr_leaf_entsize_remote xiakaixu1987
2020-09-16 18:50   ` Darrick J. Wong
2020-09-17  7:17     ` kaixuxia
2020-09-16 11:19 ` [PATCH] xfs: fix some comments xiakaixu1987
2020-09-16 21:31   ` Darrick J. Wong

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=1600255152-16086-7-git-send-email-kaixuxia@tencent.com \
    --to=xiakaixu1987@gmail.com \
    --cc=darrick.wong@oracle.com \
    --cc=kaixuxia@tencent.com \
    --cc=linux-xfs@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.