From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751834AbdECS2K (ORCPT ); Wed, 3 May 2017 14:28:10 -0400 Received: from mailrelay105.isp.belgacom.be ([195.238.20.132]:47353 "EHLO mailrelay105.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752945AbdECS2C (ORCPT ); Wed, 3 May 2017 14:28:02 -0400 X-Belgacom-Dynamic: yes IronPort-PHdr: =?us-ascii?q?9a23=3AjBCL3RO5MhdUtxih+wwl6mtUPXoX/o7sNwtQ0KIM?= =?us-ascii?q?zox0KP//rarrMEGX3/hxlliBBdydsK0UzbeO+4nbGkU+or+5+EgYd5JNUxJXwe?= =?us-ascii?q?43pCcHRPC/NEvgMfTxZDY7FskRHHVs/nW8LFQHUJ2mPw6aijSI4DUTAhTyMxZu?= =?us-ascii?q?bqSwQ9aKzpf/6+fnwIHefQhOzAW9YK9/LBKrtgiZ4tIJgYp+J6Y24gHErntBZ6?= =?us-ascii?q?JdwmY+YRq5mBy03sqs8YR49CIY7+g5+tJNS779V741QbxREHItNGVjt+PxshyW?= =?us-ascii?q?YwKF53IaGksMnxZFGQnO71muUJ77vAPhtft71TXcN8CgHuN8Yiir86o+EEygsy?= =?us-ascii?q?wALTNstTiP0sE=3D?= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A2BLAgAOIApZ/zfGs1tcHAELAQUBgmpsK?= =?us-ascii?q?IFGjnORCgGVQoIPIYV9BAKEQUAYAQEBAQEBAQEBAQFqKIIzBAEdAQSDGCMpcSQ?= =?us-ascii?q?BEooUEbNJhBGHDYZfjHeCSgWdXJMHDYICj16IeYs7HziBCk4eGIRmAYJQPjaHD?= =?us-ascii?q?4FPAQEB?= X-IPAS-Result: =?us-ascii?q?A2BLAgAOIApZ/zfGs1tcHAELAQUBgmpsKIFGjnORCgGVQoI?= =?us-ascii?q?PIYV9BAKEQUAYAQEBAQEBAQEBAQFqKIIzBAEdAQSDGCMpcSQBEooUEbNJhBGHD?= =?us-ascii?q?YZfjHeCSgWdXJMHDYICj16IeYs7HziBCk4eGIRmAYJQPjaHD4FPAQEB?= From: Fabian Frederick To: Steven Whitehouse , Bob Peterson Cc: cluster-devel@redhat.com, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, fabf@skynet.be Subject: [PATCH 1/2 linux-next] gfs2: check rename2 flags at once Date: Wed, 3 May 2017 20:27:46 +0200 Message-Id: <20170503182746.20076-1-fabf@skynet.be> X-Mailer: git-send-email 2.9.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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