[Cluster-devel] [PATCH 1/2 linux-next] gfs2: check rename2 flags at once
Fabian Frederick <[email protected]>
| Newsgroups | com.redhat.cluster-devel,org.kernel.vger.linux-fsdevel,org.kernel.vger.linux-kernel |
|---|---|
| Message-ID | <[email protected]> |
There's no need to update flags in gfs2_rename2() This will ease whiteout addition. Signed-off-by: Fabian Frederick <[email protected]> --- 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