Commit 390975ac authored by Richard Weinberger's avatar Richard Weinberger
Browse files

ubifs: Rename ubifs_rename2 



Since ->rename2 is gone, rename ubifs_rename2() to ubifs_rename().

Suggested-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent c3f8f7fa

fs/ubifs/dir.c

+6 −6
Original line number Diff line number Diff line
@@ -1060,7 +1060,7 @@ static void unlock_4_inodes(struct inode *inode1, struct inode *inode2, 
	mutex_unlock(&ubifs_inode(inode1)->ui_mutex);

}



static int ubifs_rename(struct inode *old_dir, struct dentry *old_dentry,

static int do_rename(struct inode *old_dir, struct dentry *old_dentry,

		     struct inode *new_dir, struct dentry *new_dentry,

		     unsigned int flags)

{
@@ -1323,7 +1323,7 @@ static int ubifs_xrename(struct inode *old_dir, struct dentry *old_dentry, 
	return err;

}



static int ubifs_rename2(struct inode *old_dir, struct dentry *old_dentry,

static int ubifs_rename(struct inode *old_dir, struct dentry *old_dentry,

			struct inode *new_dir, struct dentry *new_dentry,

			unsigned int flags)

{
@@ -1336,7 +1336,7 @@ static int ubifs_rename2(struct inode *old_dir, struct dentry *old_dentry, 
	if (flags & RENAME_EXCHANGE)

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



	return ubifs_rename(old_dir, old_dentry, new_dir, new_dentry, flags);

	return do_rename(old_dir, old_dentry, new_dir, new_dentry, flags);

}



int ubifs_getattr(struct vfsmount *mnt, struct dentry *dentry,
@@ -1387,7 +1387,7 @@ const struct inode_operations ubifs_dir_inode_operations = { 
	.mkdir       = ubifs_mkdir,

	.rmdir       = ubifs_rmdir,

	.mknod       = ubifs_mknod,

	.rename      = ubifs_rename2,

	.rename      = ubifs_rename,

	.setattr     = ubifs_setattr,

	.getattr     = ubifs_getattr,

	.listxattr   = ubifs_listxattr,