diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-10-11 05:02:51 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-10-11 05:02:51 +0200 |
| commit | 3873691e5ab34fa26948643d038a2b98c4437298 (patch) | |
| tree | 5327469194c2167830bce38b56a618b754cdbeea /fs/udf | |
| parent | fs: Replace current_fs_time() with current_time() (diff) | |
| parent | vfs: add note about i_op->rename changes to porting (diff) | |
| download | linux-3873691e5ab34fa26948643d038a2b98c4437298.tar.xz linux-3873691e5ab34fa26948643d038a2b98c4437298.zip | |
Merge remote-tracking branch 'ovl/rename2' into for-linus
Diffstat (limited to 'fs/udf')
| -rw-r--r-- | fs/udf/namei.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/udf/namei.c b/fs/udf/namei.c index 61af3f1e1973..2d65e280748b 100644 --- a/fs/udf/namei.c +++ b/fs/udf/namei.c @@ -1093,7 +1093,8 @@ static int udf_link(struct dentry *old_dentry, struct inode *dir, * higher-level routines. */ static int udf_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 *old_inode = d_inode(old_dentry); struct inode *new_inode = d_inode(new_dentry); @@ -1105,6 +1106,9 @@ static int udf_rename(struct inode *old_dir, struct dentry *old_dentry, struct kernel_lb_addr tloc; struct udf_inode_info *old_iinfo = UDF_I(old_inode); + if (flags & ~RENAME_NOREPLACE) + return -EINVAL; + ofi = udf_find_entry(old_dir, &old_dentry->d_name, &ofibh, &ocfi); if (IS_ERR(ofi)) { retval = PTR_ERR(ofi); |