From: xiakaixu1987@gmail.com
To: linux-xfs@vger.kernel.org
Cc: darrick.wong@oracle.com, Kaixu Xia <kaixuxia@tencent.com>
Subject: [PATCH v2 2/6] xfs: combine two if statements with same condition
Date: Sat, 11 Apr 2020 17:12:54 +0800 [thread overview]
Message-ID: <1586596378-10754-3-git-send-email-kaixuxia@tencent.com> (raw)
In-Reply-To: <1586596378-10754-1-git-send-email-kaixuxia@tencent.com>
From: Kaixu Xia <kaixuxia@tencent.com>
The two if statements have same condition, and the mask value
does not change in xfs_setattr_nonsize(), so combine them.
Signed-off-by: Kaixu Xia <kaixuxia@tencent.com>
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---
fs/xfs/xfs_iops.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
index f7a99b3bbcf7..e34814590453 100644
--- a/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@ -738,12 +738,7 @@ xfs_setattr_nonsize(
if (error) /* out of quota */
goto out_cancel;
}
- }
- /*
- * Change file ownership. Must be the owner or privileged.
- */
- if (mask & (ATTR_UID|ATTR_GID)) {
/*
* CAP_FSETID overrides the following restrictions:
*
--
2.20.0
next prev parent reply other threads:[~2020-04-11 9:13 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-11 9:12 [PATCH v2 0/6] xfs: some bugfixes and code cleanups for quota xiakaixu1987
2020-04-11 9:12 ` [PATCH v2 1/6] xfs: trace quota allocations for all quota types xiakaixu1987
2020-04-11 9:12 ` xiakaixu1987 [this message]
2020-04-11 9:12 ` [PATCH v2 3/6] xfs: reserve quota inode transaction space only when needed xiakaixu1987
2020-04-11 9:12 ` [PATCH v2 4/6] xfs: remove unnecessary variable udqp from xfs_ioctl_setattr xiakaixu1987
2020-04-11 9:12 ` [PATCH v2 5/6] xfs: remove unnecessary assertion from xfs_qm_vop_create_dqattach xiakaixu1987
2020-04-11 9:12 ` [PATCH v2 6/6] xfs: simplify the flags setting in xfs_qm_scall_quotaon xiakaixu1987
2020-04-13 15:39 ` [PATCH v2 0/6] xfs: some bugfixes and code cleanups for quota 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=1586596378-10754-3-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 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).