We already assumed rename flags when calling gfs2_exchange() Signed-off-by: Fabian Frederick <fabf@xxxxxxxxx> --- fs/gfs2/inode.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c index 9698796..b5858a3 100644 --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c @@ -1567,14 +1567,12 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry, * @odentry: The old dentry of the file * @ndir: Parent directory of new file name * @ndentry: The new dentry of the file - * @flags: The rename flags * * Returns: errno */ static int gfs2_exchange(struct inode *odir, struct dentry *odentry, - struct inode *ndir, struct dentry *ndentry, - unsigned int flags) + struct inode *ndir, struct dentry *ndentry) { struct gfs2_inode *odip = GFS2_I(odir); struct gfs2_inode *ndip = GFS2_I(ndir); @@ -1710,7 +1708,7 @@ static int gfs2_rename2(struct inode *odir, struct dentry *odentry, return -EINVAL; if (flags & RENAME_EXCHANGE) - return gfs2_exchange(odir, odentry, ndir, ndentry, flags); + return gfs2_exchange(odir, odentry, ndir, ndentry); return gfs2_rename(odir, odentry, ndir, ndentry); } -- 2.9.3