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/nilfs2 | |
| 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/nilfs2')
| -rw-r--r-- | fs/nilfs2/namei.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/nilfs2/namei.c b/fs/nilfs2/namei.c index dbcf1dc93a51..8540c13ef374 100644 --- a/fs/nilfs2/namei.c +++ b/fs/nilfs2/namei.c | |||
| @@ -350,7 +350,8 @@ static int nilfs_rmdir(struct inode *dir, struct dentry *dentry) | |||
| 350 | } | 350 | } |
| 351 | 351 | ||
| 352 | static int nilfs_rename(struct inode *old_dir, struct dentry *old_dentry, | 352 | static int nilfs_rename(struct inode *old_dir, struct dentry *old_dentry, |
| 353 | struct inode *new_dir, struct dentry *new_dentry) | 353 | struct inode *new_dir, struct dentry *new_dentry, |
| 354 | unsigned int flags) | ||
| 354 | { | 355 | { |
| 355 | struct inode *old_inode = d_inode(old_dentry); | 356 | struct inode *old_inode = d_inode(old_dentry); |
| 356 | struct inode *new_inode = d_inode(new_dentry); | 357 | struct inode *new_inode = d_inode(new_dentry); |
| @@ -361,6 +362,9 @@ static int nilfs_rename(struct inode *old_dir, struct dentry *old_dentry, | |||
| 361 | struct nilfs_transaction_info ti; | 362 | struct nilfs_transaction_info ti; |
| 362 | int err; | 363 | int err; |
| 363 | 364 | ||
| 365 | if (flags & ~RENAME_NOREPLACE) | ||
| 366 | return -EINVAL; | ||
| 367 | |||
| 364 | err = nilfs_transaction_begin(old_dir->i_sb, &ti, 1); | 368 | err = nilfs_transaction_begin(old_dir->i_sb, &ti, 1); |
| 365 | if (unlikely(err)) | 369 | if (unlikely(err)) |
| 366 | return err; | 370 | return err; |
| @@ -552,7 +556,7 @@ const struct inode_operations nilfs_dir_inode_operations = { | |||
| 552 | .mkdir = nilfs_mkdir, | 556 | .mkdir = nilfs_mkdir, |
| 553 | .rmdir = nilfs_rmdir, | 557 | .rmdir = nilfs_rmdir, |
| 554 | .mknod = nilfs_mknod, | 558 | .mknod = nilfs_mknod, |
| 555 | .rename = nilfs_rename, | 559 | .rename2 = nilfs_rename, |
| 556 | .setattr = nilfs_setattr, | 560 | .setattr = nilfs_setattr, |
| 557 | .permission = nilfs_permission, | 561 | .permission = nilfs_permission, |
| 558 | .fiemap = nilfs_fiemap, | 562 | .fiemap = nilfs_fiemap, |
