Merge branch 'xfs-rename-whiteout' into for-next

Conflicts: fs/xfs/xfs_inode.c

Merge branch 'xfs-rename-whiteout' into for-next
Conflicts: fs/xfs/xfs_inode.c
d41bb034 · Dave Chinner · 88e8fda9 · 7dcf5c3e · d41bb034 · d41bb034
Commit d41bb034 authored Mar 25, 2015 by Dave Chinner
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 239 additions and 171 deletions

fs/xfs/xfs_inode.c fs/xfs/xfs_inode.c +238 -170

fs/xfs/xfs_iops.c fs/xfs/xfs_iops.c +1 -1

No files found.
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
--- a/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@ -394,7 +394,7 @@ xfs_vn_rename(
 	struct xfs_name	oname;
 	struct xfs_name	nname;

-	if (flags & ~(RENAME_NOREPLACE | RENAME_EXCHANGE))
+	if (flags & ~(RENAME_NOREPLACE | RENAME_EXCHANGE | RENAME_WHITEOUT))
 		return -EINVAL;

 	/* if we are exchanging files, we need to set i_mode of both files */