From: Miklos Szeredi <mszeredi@xxxxxxx> Expand noreplace_rename2() because next patch will implement one more flag. Signed-off-by: Miklos Szeredi <mszeredi@xxxxxxx> --- mm/shmem.c | 9 +++++++++ 1 file changed, 9 insertions(+) --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1995,6 +1995,14 @@ static int shmem_rename(struct inode *ol return 0; } +static int shmem_rename2(struct inode *old_dir, struct dentry *old_dentry, struct inode *new_dir, struct dentry *new_dentry, unsigned int flags) +{ + if (flags & ~(RENAME_NOREPLACE)) + return -EINVAL; + + return shmem_rename(old_dir, old_dentry, new_dir, new_dentry); +} + static int shmem_symlink(struct inode *dir, struct dentry *dentry, const char *symname) { int error; @@ -2658,6 +2666,7 @@ static const struct inode_operations shm .rmdir = shmem_rmdir, .mknod = shmem_mknod, .rename = shmem_rename, + .rename2 = shmem_rename2, .tmpfile = shmem_tmpfile, #endif #ifdef CONFIG_TMPFS_XATTR -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html