diff options
author | Miklos Szeredi <mszeredi@redhat.com> | 2016-09-27 05:03:57 -0400 |
---|---|---|
committer | Miklos Szeredi <mszeredi@redhat.com> | 2016-09-27 05:03:57 -0400 |
commit | f03b8ad8d38634d13e802165cc15917481b47835 (patch) | |
tree | 4dc9c060684f242d1e6c07d28d1ff625db63fd6c /fs/sysv | |
parent | 9a232de4999666b2e8ea6775b2b0e3e4feb09b7a (diff) |
fs: support RENAME_NOREPLACE for local filesystems
This is trivial to do:
- add flags argument to foo_rename()
- check if flags doesn't have any other than RENAME_NOREPLACE
- assign foo_rename() to .rename2 instead of .rename
Filesystems converted:
affs, bfs, exofs, ext2, hfs, hfsplus, jffs2, jfs, logfs, minix, msdos,
nilfs2, omfs, reiserfs, sysvfs, ubifs, udf, ufs, vfat.
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Acked-by: Boaz Harrosh <ooo@electrozaur.com>
Acked-by: Richard Weinberger <richard@nod.at>
Acked-by: Bob Copeland <me@bobcopeland.com>
Acked-by: Jan Kara <jack@suse.cz>
Cc: Theodore Ts'o <tytso@mit.edu>
Cc: Jaegeuk Kim <jaegeuk@kernel.org>
Cc: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Cc: Mikulas Patocka <mpatocka@redhat.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Dave Kleikamp <shaggy@kernel.org>
Cc: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Cc: Christoph Hellwig <hch@infradead.org>
Diffstat (limited to 'fs/sysv')
-rw-r--r-- | fs/sysv/namei.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/sysv/namei.c b/fs/sysv/namei.c index a42de45ce40d..765d79de1217 100644 --- a/fs/sysv/namei.c +++ b/fs/sysv/namei.c | |||
@@ -206,7 +206,8 @@ static int sysv_rmdir(struct inode * dir, struct dentry * dentry) | |||
206 | * higher-level routines. | 206 | * higher-level routines. |
207 | */ | 207 | */ |
208 | static int sysv_rename(struct inode * old_dir, struct dentry * old_dentry, | 208 | static int sysv_rename(struct inode * old_dir, struct dentry * old_dentry, |
209 | struct inode * new_dir, struct dentry * new_dentry) | 209 | struct inode * new_dir, struct dentry * new_dentry, |
210 | unsigned int flags) | ||
210 | { | 211 | { |
211 | struct inode * old_inode = d_inode(old_dentry); | 212 | struct inode * old_inode = d_inode(old_dentry); |
212 | struct inode * new_inode = d_inode(new_dentry); | 213 | struct inode * new_inode = d_inode(new_dentry); |
@@ -216,6 +217,9 @@ static int sysv_rename(struct inode * old_dir, struct dentry * old_dentry, | |||
216 | struct sysv_dir_entry * old_de; | 217 | struct sysv_dir_entry * old_de; |
217 | int err = -ENOENT; | 218 | int err = -ENOENT; |
218 | 219 | ||
220 | if (flags & ~RENAME_NOREPLACE) | ||
221 | return -EINVAL; | ||
222 | |||
219 | old_de = sysv_find_entry(old_dentry, &old_page); | 223 | old_de = sysv_find_entry(old_dentry, &old_page); |
220 | if (!old_de) | 224 | if (!old_de) |
221 | goto out; | 225 | goto out; |
@@ -285,6 +289,6 @@ const struct inode_operations sysv_dir_inode_operations = { | |||
285 | .mkdir = sysv_mkdir, | 289 | .mkdir = sysv_mkdir, |
286 | .rmdir = sysv_rmdir, | 290 | .rmdir = sysv_rmdir, |
287 | .mknod = sysv_mknod, | 291 | .mknod = sysv_mknod, |
288 | .rename = sysv_rename, | 292 | .rename2 = sysv_rename, |
289 | .getattr = sysv_getattr, | 293 | .getattr = sysv_getattr, |
290 | }; | 294 | }; |