From mboxrd@z Thu Jan 1 00:00:00 1970 From: Fabian Frederick Date: Wed, 3 May 2017 20:27:46 +0200 Subject: [Cluster-devel] [PATCH 1/2 linux-next] gfs2: check rename2 flags at once Message-ID: <20170503182746.20076-1-fabf@skynet.be> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit There's no need to update flags in gfs2_rename2() This will ease whiteout addition. Signed-off-by: Fabian Frederick --- fs/gfs2/inode.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c index 9f605ea..9698796 100644 --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c @@ -1706,9 +1706,7 @@ static int gfs2_rename2(struct inode *odir, struct dentry *odentry, struct inode *ndir, struct dentry *ndentry, unsigned int flags) { - flags &= ~RENAME_NOREPLACE; - - if (flags & ~RENAME_EXCHANGE) + if (flags & ~(RENAME_NOREPLACE | RENAME_EXCHANGE)) return -EINVAL; if (flags & RENAME_EXCHANGE) -- 2.9.3