aboutsummaryrefslogtreecommitdiffstats
path: root/fs/omfs
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@redhat.com>2016-09-27 05:03:57 -0400
committerMiklos Szeredi <mszeredi@redhat.com>2016-09-27 05:03:57 -0400
commitf03b8ad8d38634d13e802165cc15917481b47835 (patch)
tree4dc9c060684f242d1e6c07d28d1ff625db63fd6c /fs/omfs
parent9a232de4999666b2e8ea6775b2b0e3e4feb09b7a (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/omfs')
-rw-r--r--fs/omfs/dir.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/omfs/dir.c b/fs/omfs/dir.c
index c8cbf3b60645..417511bbe362 100644
--- a/fs/omfs/dir.c
+++ b/fs/omfs/dir.c
@@ -371,12 +371,16 @@ static bool omfs_fill_chain(struct inode *dir, struct dir_context *ctx,
371} 371}
372 372
373static int omfs_rename(struct inode *old_dir, struct dentry *old_dentry, 373static int omfs_rename(struct inode *old_dir, struct dentry *old_dentry,
374 struct inode *new_dir, struct dentry *new_dentry) 374 struct inode *new_dir, struct dentry *new_dentry,
375 unsigned int flags)
375{ 376{
376 struct inode *new_inode = d_inode(new_dentry); 377 struct inode *new_inode = d_inode(new_dentry);
377 struct inode *old_inode = d_inode(old_dentry); 378 struct inode *old_inode = d_inode(old_dentry);
378 int err; 379 int err;
379 380
381 if (flags & ~RENAME_NOREPLACE)
382 return -EINVAL;
383
380 if (new_inode) { 384 if (new_inode) {
381 /* overwriting existing file/dir */ 385 /* overwriting existing file/dir */
382 err = omfs_remove(new_dir, new_dentry); 386 err = omfs_remove(new_dir, new_dentry);
@@ -444,7 +448,7 @@ static int omfs_readdir(struct file *file, struct dir_context *ctx)
444const struct inode_operations omfs_dir_inops = { 448const struct inode_operations omfs_dir_inops = {
445 .lookup = omfs_lookup, 449 .lookup = omfs_lookup,
446 .mkdir = omfs_mkdir, 450 .mkdir = omfs_mkdir,
447 .rename = omfs_rename, 451 .rename2 = omfs_rename,
448 .create = omfs_create, 452 .create = omfs_create,
449 .unlink = omfs_remove, 453 .unlink = omfs_remove,
450 .rmdir = omfs_remove, 454 .rmdir = omfs_remove,