diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-10-10 23:02:51 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-10-10 23:02:51 -0400 |
| commit | 3873691e5ab34fa26948643d038a2b98c4437298 (patch) | |
| tree | 5327469194c2167830bce38b56a618b754cdbeea /fs/hpfs | |
| parent | c2050a454c7f123d7a57fa1d76ff61bd43643abb (diff) | |
| parent | aadfa8019e8114539cfa0b1eb2e5a9c83094a590 (diff) | |
Merge remote-tracking branch 'ovl/rename2' into for-linus
Diffstat (limited to 'fs/hpfs')
| -rw-r--r-- | fs/hpfs/namei.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/hpfs/namei.c b/fs/hpfs/namei.c index bb8d67e2740a..f30c14414518 100644 --- a/fs/hpfs/namei.c +++ b/fs/hpfs/namei.c @@ -507,7 +507,8 @@ const struct address_space_operations hpfs_symlink_aops = { }; static int hpfs_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) { const unsigned char *old_name = old_dentry->d_name.name; unsigned old_len = old_dentry->d_name.len; @@ -524,6 +525,9 @@ static int hpfs_rename(struct inode *old_dir, struct dentry *old_dentry, struct fnode *fnode; int err; + if (flags & ~RENAME_NOREPLACE) + return -EINVAL; + if ((err = hpfs_chk_name(new_name, &new_len))) return err; err = 0; hpfs_adjust_length(old_name, &old_len); |