Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f03b8ad8 authored by Miklos Szeredi's avatar Miklos Szeredi
Browse files

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: default avatarMiklos Szeredi <mszeredi@redhat.com>
Acked-by: default avatarBoaz Harrosh <ooo@electrozaur.com>
Acked-by: default avatarRichard Weinberger <richard@nod.at>
Acked-by: default avatarBob Copeland <me@bobcopeland.com>
Acked-by: default avatarJan 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>
parent 9a232de4

fs/affs/affs.h

+2 −1
Original line number Diff line number Diff line
@@ -173,7 +173,8 @@ extern int affs_link(struct dentry *olddentry, struct inode *dir, 
extern int	affs_symlink(struct inode *dir, struct dentry *dentry,

			     const char *symname);

extern int	affs_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);



/* inode.c */

fs/affs/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ const struct inode_operations affs_dir_inode_operations = { 
	.symlink	= affs_symlink,

	.mkdir		= affs_mkdir,

	.rmdir		= affs_rmdir,

	.rename		= affs_rename,

	.rename2	= affs_rename,

	.setattr	= affs_notify_change,

};

fs/affs/namei.c

+5 −1
Original line number Diff line number Diff line
@@ -414,12 +414,16 @@ affs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *dentry) 


int

affs_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 super_block *sb = old_dir->i_sb;

	struct buffer_head *bh = NULL;

	int retval;



	if (flags & ~RENAME_NOREPLACE)

		return -EINVAL;



	pr_debug("%s(old=%lu,\"%pd\" to new=%lu,\"%pd\")\n", __func__,

		 old_dir->i_ino, old_dentry, new_dir->i_ino, new_dentry);

fs/bfs/dir.c

+6 −2
Original line number Diff line number Diff line
@@ -207,7 +207,8 @@ static int bfs_unlink(struct inode *dir, struct dentry *dentry) 
}



static int bfs_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 inode *old_inode, *new_inode;

	struct buffer_head *old_bh, *new_bh;
@@ -215,6 +216,9 @@ static int bfs_rename(struct inode *old_dir, struct dentry *old_dentry, 
	struct bfs_sb_info *info;

	int error = -ENOENT;



	if (flags & ~RENAME_NOREPLACE)

		return -EINVAL;



	old_bh = new_bh = NULL;

	old_inode = d_inode(old_dentry);

	if (S_ISDIR(old_inode->i_mode))
@@ -270,7 +274,7 @@ const struct inode_operations bfs_dir_inops = { 
	.lookup			= bfs_lookup,

	.link			= bfs_link,

	.unlink			= bfs_unlink,

	.rename			= bfs_rename,

	.rename2		= bfs_rename,

};



static int bfs_add_entry(struct inode *dir, const unsigned char *name,

fs/exofs/namei.c

+6 −2
Original line number Diff line number Diff line
@@ -227,7 +227,8 @@ static int exofs_rmdir(struct inode *dir, struct dentry *dentry) 
}



static int exofs_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 inode *old_inode = d_inode(old_dentry);

	struct inode *new_inode = d_inode(new_dentry);
@@ -237,6 +238,9 @@ static int exofs_rename(struct inode *old_dir, struct dentry *old_dentry, 
	struct exofs_dir_entry *old_de;

	int err = -ENOENT;



	if (flags & ~RENAME_NOREPLACE)

		return -EINVAL;



	old_de = exofs_find_entry(old_dir, old_dentry, &old_page);

	if (!old_de)

		goto out;
@@ -310,7 +314,7 @@ const struct inode_operations exofs_dir_inode_operations = { 
	.mkdir  	= exofs_mkdir,

	.rmdir  	= exofs_rmdir,

	.mknod  	= exofs_mknod,

	.rename 	= exofs_rename,

	.rename2	= exofs_rename,

	.setattr	= exofs_setattr,

};