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

Commit c6184028 authored by Fabian Frederick's avatar Fabian Frederick Committed by Al Viro
Browse files

fs/affs: add rename2 to prepare multiple methods 



Currently AFFS only supports RENAME_NOREPLACE.
This patch isolates that method to a static function to
prepare RENAME_EXCHANGE addition.

Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent deccf497

fs/affs/affs.h

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

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,

extern int	affs_rename2(struct inode *old_dir, struct dentry *old_dentry,

			    struct inode *new_dir, struct dentry *new_dentry,

			    unsigned int flags);

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,

	.rename		= affs_rename2,

	.setattr	= affs_notify_change,

};

fs/affs/namei.c

+16 −9
Original line number Diff line number Diff line
@@ -394,21 +394,14 @@ affs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *dentry) 
	return affs_add_entry(dir, inode, dentry, ST_LINKFILE);

}



int

static int

affs_rename(struct inode *old_dir, struct dentry *old_dentry,

	    struct inode *new_dir, struct dentry *new_dentry,

	    unsigned int flags)

	    struct inode *new_dir, struct dentry *new_dentry)

{

	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);



	retval = affs_check_name(new_dentry->d_name.name,

				 new_dentry->d_name.len,

				 affs_nofilenametruncate(old_dentry));
@@ -448,6 +441,20 @@ affs_rename(struct inode *old_dir, struct dentry *old_dentry, 
	return retval;

}



int affs_rename2(struct inode *old_dir, struct dentry *old_dentry,

			struct inode *new_dir, struct dentry *new_dentry,

			unsigned int flags)

{



	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);



	return affs_rename(old_dir, old_dentry, new_dir, new_dentry);

}



static struct dentry *affs_get_parent(struct dentry *child)

{

	struct inode *parent;