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/jfs | |
| parent | fs: Replace current_fs_time() with current_time() (diff) | |
| parent | vfs: add note about i_op->rename changes to porting (diff) | |
| download | linux-dev-3873691e5ab34fa26948643d038a2b98c4437298.tar.xz linux-dev-3873691e5ab34fa26948643d038a2b98c4437298.zip | |
Merge remote-tracking branch 'ovl/rename2' into for-linus
Diffstat (limited to 'fs/jfs')
| -rw-r--r-- | fs/jfs/namei.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c index 10449c1deac0..d1d7c43abb63 100644 --- a/fs/jfs/namei.c +++ b/fs/jfs/namei.c @@ -1078,7 +1078,8 @@ static int jfs_symlink(struct inode *dip, struct dentry *dentry, * FUNCTION: rename a file or directory */ static int jfs_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 btstack btstack; ino_t ino; @@ -1097,6 +1098,8 @@ static int jfs_rename(struct inode *old_dir, struct dentry *old_dentry, s64 new_size = 0; int commit_flag; + if (flags & ~RENAME_NOREPLACE) + return -EINVAL; jfs_info("jfs_rename: %pd %pd", old_dentry, new_dentry); |