On Tue, Aug 23, 2016 at 04:05:27PM +0200, Miklos Szeredi wrote:
omfs/dir.c b/fs/omfs/dir.c
> index c8cbf3b60645..417511bbe362 100644
> --- a/fs/omfs/dir.c
> +++ b/fs/omfs/dir.c
> @@ -371,12 +371,16 @@ static bool omfs_fill_chain(struct inode *dir, struct
> dir_context *ctx,
> }
>
> static int omfs_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 inode *new_inode = d_inode(new_dentry);
> struct inode *old_inode = d_inode(old_dentry);
> int err;
>
> + if (flags & ~RENAME_NOREPLACE)
> + return -EINVAL;
> +
> if (new_inode) {
> /* overwriting existing file/dir */
> err = omfs_remove(new_dir, new_dentry);
> @@ -444,7 +448,7 @@ static int omfs_readdir(struct file *file, struct
> dir_context *ctx)
omfs changes look fine.
Acked-by: Bob Copeland <m...@bobcopeland.com>
--
Bob Copeland %% http://bobcopeland.com/
