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

Commit 18fc84da authored by Miklos Szeredi's avatar Miklos Szeredi
Browse files

vfs: remove unused i_op->rename 



No in-tree uses remain.

Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
parent 1cd66c93

Documentation/filesystems/Locking

+1 −5
Original line number Diff line number Diff line
@@ -50,8 +50,6 @@ prototypes: 
	int (*mkdir) (struct inode *,struct dentry *,umode_t);

	int (*rmdir) (struct inode *,struct dentry *);

	int (*mknod) (struct inode *,struct dentry *,umode_t,dev_t);

	int (*rename) (struct inode *, struct dentry *,

			struct inode *, struct dentry *);

	int (*rename2) (struct inode *, struct dentry *,

			struct inode *, struct dentry *, unsigned int);

	int (*readlink) (struct dentry *, char __user *,int);
@@ -83,7 +81,6 @@ symlink: yes 
mkdir:		yes

unlink:		yes (both)

rmdir:		yes (both)	(see below)

rename:		yes (all)	(see below)

rename2:	yes (all)	(see below)

readlink:	no

get_link:	no
@@ -102,8 +99,7 @@ tmpfile: no 


	Additionally, ->rmdir(), ->unlink() and ->rename() have ->i_mutex on

victim.

	cross-directory ->rename() and rename2() has (per-superblock)

->s_vfs_rename_sem.

	cross-directory ->rename2() has (per-superblock) ->s_vfs_rename_sem.



See Documentation/filesystems/directory-locking for more detailed discussion

of the locking scheme for directory operations.

Documentation/filesystems/directory-locking

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ locks victim and calls the method. Locks are exclusive. 


4) rename() that is _not_ cross-directory.  Locking rules: caller locks

the parent and finds source and target.  In case of exchange (with

RENAME_EXCHANGE in rename2() flags argument) lock both.  In any case,

RENAME_EXCHANGE in flags argument) lock both.  In any case,

if the target already exists, lock it.  If the source is a non-directory,

lock it.  If we need to lock both, lock them in inode pointer order.

Then call the method.  All locks are exclusive.

Documentation/filesystems/vfs.txt

+2 −7
Original line number Diff line number Diff line
@@ -345,8 +345,6 @@ struct inode_operations { 
	int (*mkdir) (struct inode *,struct dentry *,umode_t);

	int (*rmdir) (struct inode *,struct dentry *);

	int (*mknod) (struct inode *,struct dentry *,umode_t,dev_t);

	int (*rename) (struct inode *, struct dentry *,

			struct inode *, struct dentry *);

	int (*rename2) (struct inode *, struct dentry *,

			struct inode *, struct dentry *, unsigned int);

	int (*readlink) (struct dentry *, char __user *,int);
@@ -416,11 +414,8 @@ otherwise noted. 
  rename: called by the rename(2) system call to rename the object to

	have the parent and name given by the second inode and dentry.



  rename2: this has an additional flags argument compared to rename.

	If no flags are supported by the filesystem then this method

	need not be implemented.  If some flags are supported then the

	filesystem must return -EINVAL for any unsupported or unknown

	flags.  Currently the following flags are implemented:

	The filesystem must return -EINVAL for any unsupported or

	unknown	flags.  Currently the following flags are implemented:

	(1) RENAME_NOREPLACE: this flag indicates that if the target

	of the rename exists the rename should fail with -EEXIST

	instead of replacing the target.  The VFS already checks for

fs/cachefiles/namei.c

+1 −2
Original line number Diff line number Diff line
@@ -804,8 +804,7 @@ struct dentry *cachefiles_get_directory(struct cachefiles_cache *cache, 
	    !d_backing_inode(subdir)->i_op->lookup ||

	    !d_backing_inode(subdir)->i_op->mkdir ||

	    !d_backing_inode(subdir)->i_op->create ||

	    (!d_backing_inode(subdir)->i_op->rename &&

	     !d_backing_inode(subdir)->i_op->rename2) ||

	    !d_backing_inode(subdir)->i_op->rename2 ||

	    !d_backing_inode(subdir)->i_op->rmdir ||

	    !d_backing_inode(subdir)->i_op->unlink)

		goto check_error;

fs/namei.c

+3 −12
Original line number Diff line number Diff line
@@ -4369,12 +4369,9 @@ int vfs_rename(struct inode *old_dir, struct dentry *old_dentry, 
	if (error)

		return error;



	if (!old_dir->i_op->rename && !old_dir->i_op->rename2)

	if (!old_dir->i_op->rename2)

		return -EPERM;



	if (flags && !old_dir->i_op->rename2)

		return -EINVAL;



	/*

	 * If we are going to change the parent - check write permissions,

	 * we'll need to flip '..'.
@@ -4428,14 +4425,8 @@ int vfs_rename(struct inode *old_dir, struct dentry *old_dentry, 
		if (error)

			goto out;

	}

	if (!old_dir->i_op->rename2) {

		error = old_dir->i_op->rename(old_dir, old_dentry,

					      new_dir, new_dentry);

	} else {

		WARN_ON(old_dir->i_op->rename != NULL);

	error = old_dir->i_op->rename2(old_dir, old_dentry,

				       new_dir, new_dentry, flags);

	}

	if (error)

		goto out;