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

Commit 1cd66c93 authored by Miklos Szeredi's avatar Miklos Szeredi
Browse files

fs: make remaining filesystems use .rename2 



This is trivial to do:

 - add flags argument to foo_rename()
 - check if flags is zero
 - assign foo_rename() to .rename2 instead of .rename

This doesn't mean it's impossible to support RENAME_NOREPLACE for these
filesystems, but it is not trivial, like for local filesystems.
RENAME_NOREPLACE must guarantee atomicity (i.e. it shouldn't be possible
for a file to be created on one host while it is overwritten by rename on
another host).

Filesystems converted:

9p, afs, ceph, coda, ecryptfs, kernfs, lustre, ncpfs, nfs, ocfs2, orangefs.

After this, we can get rid of the duplicate interfaces for rename.

Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: David Howells <dhowells@redhat.com> [AFS]
Acked-by: default avatarMike Marshall <hubcap@omnibond.com>
Cc: Eric Van Hensbergen <ericvh@gmail.com>
Cc: Ilya Dryomov <idryomov@gmail.com>
Cc: Jan Harkes <jaharkes@cs.cmu.edu>
Cc: Tyler Hicks <tyhicks@canonical.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Cc: Trond Myklebust <trond.myklebust@primarydata.com>
Cc: Mark Fasheh <mfasheh@suse.com>
parent e0e0be8a

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

+6 −2
Original line number Diff line number Diff line
@@ -1050,13 +1050,17 @@ static int ll_link(struct dentry *old_dentry, struct inode *dir, 
}



static int ll_rename(struct inode *src, struct dentry *src_dchild,

		     struct inode *tgt, struct dentry *tgt_dchild)

		     struct inode *tgt, struct dentry *tgt_dchild,

		     unsigned int flags)

{

	struct ptlrpc_request *request = NULL;

	struct ll_sb_info *sbi = ll_i2sbi(src);

	struct md_op_data *op_data;

	int err;



	if (flags)

		return -EINVAL;



	CDEBUG(D_VFSTRACE,

	       "VFS Op:oldname=%pd, src_dir="DFID"(%p), newname=%pd, tgt_dir="DFID"(%p)\n",

	       src_dchild, PFID(ll_inode2fid(src)), src,
@@ -1102,7 +1106,7 @@ const struct inode_operations ll_dir_inode_operations = { 
	.rmdir	      = ll_rmdir,

	.symlink	    = ll_symlink,

	.link	       = ll_link,

	.rename	     = ll_rename,

	.rename2	= ll_rename,

	.setattr	    = ll_setattr,

	.getattr	    = ll_getattr,

	.permission	 = ll_inode_permission,

fs/9p/v9fs.h

+2 −1
Original line number Diff line number Diff line
@@ -148,7 +148,8 @@ extern struct dentry *v9fs_vfs_lookup(struct inode *dir, struct dentry *dentry, 
extern int v9fs_vfs_unlink(struct inode *i, struct dentry *d);

extern int v9fs_vfs_rmdir(struct inode *i, struct dentry *d);

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

extern struct inode *v9fs_inode_from_fid(struct v9fs_session_info *v9ses,

					 struct p9_fid *fid,

					 struct super_block *sb, int new);

fs/9p/vfs_inode.c

+7 −3
Original line number Diff line number Diff line
@@ -955,7 +955,8 @@ int v9fs_vfs_rmdir(struct inode *i, struct dentry *d) 


int

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

{

	int retval;

	struct inode *old_inode;
@@ -966,6 +967,9 @@ v9fs_vfs_rename(struct inode *old_dir, struct dentry *old_dentry, 
	struct p9_fid *newdirfid;

	struct p9_wstat wstat;



	if (flags)

		return -EINVAL;



	p9_debug(P9_DEBUG_VFS, "\n");

	retval = 0;

	old_inode = d_inode(old_dentry);
@@ -1436,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,

	.rename = v9fs_vfs_rename,

	.rename2 = v9fs_vfs_rename,

	.getattr = v9fs_vfs_getattr,

	.setattr = v9fs_vfs_setattr,

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

	.rmdir = v9fs_vfs_rmdir,

	.mknod = v9fs_vfs_mknod,

	.rename = v9fs_vfs_rename,

	.rename2 = 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,

	.rename = v9fs_vfs_rename,

	.rename2 = v9fs_vfs_rename,

	.getattr = v9fs_vfs_getattr_dotl,

	.setattr = v9fs_vfs_setattr_dotl,

	.setxattr = generic_setxattr,

fs/afs/dir.c

+8 −3
Original line number Diff line number Diff line
@@ -38,7 +38,8 @@ static int afs_link(struct dentry *from, struct inode *dir, 
static int afs_symlink(struct inode *dir, struct dentry *dentry,

		       const char *content);

static int afs_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);



const struct file_operations afs_dir_file_operations = {

	.open		= afs_dir_open,
@@ -56,7 +57,7 @@ const struct inode_operations afs_dir_inode_operations = { 
	.symlink	= afs_symlink,

	.mkdir		= afs_mkdir,

	.rmdir		= afs_rmdir,

	.rename		= afs_rename,

	.rename2	= afs_rename,

	.permission	= afs_permission,

	.getattr	= afs_getattr,

	.setattr	= afs_setattr,
@@ -1083,12 +1084,16 @@ static int afs_symlink(struct inode *dir, struct dentry *dentry, 
 * rename a file in an AFS filesystem and/or move it between directories

 */

static int afs_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 afs_vnode *orig_dvnode, *new_dvnode, *vnode;

	struct key *key;

	int ret;



	if (flags)

		return -EINVAL;



	vnode = AFS_FS_I(d_inode(old_dentry));

	orig_dvnode = AFS_FS_I(old_dir);

	new_dvnode = AFS_FS_I(new_dir);