Miklos,
On 23.08.2016 16:05, Miklos Szeredi wrote:
> diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c
> index 4b86d3a738e1..23d1ebabc688 100644
> --- a/fs/ubifs/dir.c
> +++ b/fs/ubifs/dir.c
> @@ -966,7 +966,8 @@ static void unlock_3_inodes(struct inode *inode1, struct inode *inode2,
> }
>
> static int ubifs_rename(struct inode *old_dir, struct dentry *old_dentry,
> - struct inode *new_dir, struct dentry *new_dentry)
> + struct inode *new_dir, struct dentry *new_dentry,
> + unsigned int flags)
> {
> struct ubifs_info *c = old_dir->i_sb->s_fs_info;
> struct inode *old_inode = d_inode(old_dentry);
> @@ -984,6 +985,9 @@ static int ubifs_rename(struct inode *old_dir, struct dentry *old_dentry,
> struct timespec time;
> unsigned int uninitialized_var(saved_nlink);
>
> + if (flags & ~RENAME_NOREPLACE)
> + return -EINVAL;
> +
> /*
> * Budget request settings: deletion direntry, new direntry, removing
> * the old inode, and changing old and new parent directory inodes.
> @@ -1179,7 +1183,7 @@ const struct inode_operations ubifs_dir_inode_operations = {
> .mkdir = ubifs_mkdir,
> .rmdir = ubifs_rmdir,
> .mknod = ubifs_mknod,
> - .rename = ubifs_rename,
> + .rename2 = ubifs_rename,
> .setattr = ubifs_setattr,
> .getattr = ubifs_getattr,
> .setxattr = generic_setxattr,
For UBIFS,
Acked-by: Richard Weinberger <richard@xxxxxx>
Thanks,,
//richard
--
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
