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

Commit 2773bf00 authored by Miklos Szeredi's avatar Miklos Szeredi
Browse files

fs: rename "rename2" i_op to "rename" 



Generated patch:

sed -i "s/\.rename2\t/\.rename\t\t/" `git grep -wl rename2`
sed -i "s/\brename2\b/rename/g" `git grep -wl rename2`

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

Documentation/filesystems/Locking

+3 −3
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 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 (*rename2) (struct inode *, struct dentry *,

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

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

	int (*readlink) (struct dentry *, char __user *,int);

	const char *(*get_link) (struct dentry *, struct inode *, void **);
@@ -81,7 +81,7 @@ symlink: yes 
mkdir:		yes

unlink:		yes (both)

rmdir:		yes (both)	(see below)

rename2:	yes (all)	(see below)

rename:	yes (all)	(see below)

readlink:	no

get_link:	no

setattr:	yes
@@ -99,7 +99,7 @@ tmpfile: no 


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

victim.

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

	cross-directory ->rename() 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/vfs.txt

+1 −1
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ 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 (*rename2) (struct inode *, struct dentry *,

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

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

	int (*readlink) (struct dentry *, char __user *,int);

	const char *(*get_link) (struct dentry *, struct inode *,

drivers/staging/lustre/lustre/llite/namei.c

+1 −1
Original line number Diff line number Diff line
@@ -1106,7 +1106,7 @@ const struct inode_operations ll_dir_inode_operations = { 
	.rmdir	      = ll_rmdir,

	.symlink	    = ll_symlink,

	.link	       = ll_link,

	.rename2	= ll_rename,

	.rename		= ll_rename,

	.setattr	    = ll_setattr,

	.getattr	    = ll_getattr,

	.permission	 = ll_inode_permission,

fs/9p/vfs_inode.c

+2 −2
Original line number Diff line number Diff line
@@ -1440,7 +1440,7 @@ static const struct inode_operations v9fs_dir_inode_operations_dotu = { 
	.mkdir = v9fs_vfs_mkdir,

	.rmdir = v9fs_vfs_rmdir,

	.mknod = v9fs_vfs_mknod,

	.rename2 = v9fs_vfs_rename,

	.rename = v9fs_vfs_rename,

	.getattr = v9fs_vfs_getattr,

	.setattr = v9fs_vfs_setattr,

};
@@ -1453,7 +1453,7 @@ static const struct inode_operations v9fs_dir_inode_operations = { 
	.mkdir = v9fs_vfs_mkdir,

	.rmdir = v9fs_vfs_rmdir,

	.mknod = v9fs_vfs_mknod,

	.rename2 = v9fs_vfs_rename,

	.rename = v9fs_vfs_rename,

	.getattr = v9fs_vfs_getattr,

	.setattr = v9fs_vfs_setattr,

};

fs/9p/vfs_inode_dotl.c

+1 −1
Original line number Diff line number Diff line
@@ -964,7 +964,7 @@ const struct inode_operations v9fs_dir_inode_operations_dotl = { 
	.mkdir = v9fs_vfs_mkdir_dotl,

	.rmdir = v9fs_vfs_rmdir,

	.mknod = v9fs_vfs_mknod_dotl,

	.rename2 = v9fs_vfs_rename,

	.rename = v9fs_vfs_rename,

	.getattr = v9fs_vfs_getattr_dotl,

	.setattr = v9fs_vfs_setattr_dotl,

	.setxattr = generic_setxattr,