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

Commit 96f9d8c0 authored by Jeff Layton's avatar Jeff Layton Committed by Trond Myklebust
Browse files

nfs: abstract out code needed to complete a sillyrename 



The async rename code is currently "polluted" with some parts that are
really just for sillyrenames. Add a new "complete" operation vector to
the nfs_renamedata to separate out the stuff that just needs to be done
for a sillyrename.

Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Tested-by: default avatarAnna Schumaker <Anna.Schumaker@netapp.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 4f14c194

fs/nfs/unlink.c

+18 −4
Original line number Diff line number Diff line
@@ -353,8 +353,8 @@ static void nfs_async_rename_done(struct rpc_task *task, void *calldata) 
		return;

	}



	if (task->tk_status != 0)

		nfs_cancel_async_unlink(old_dentry);

	if (data->complete)

		data->complete(task, data);

}



/**
@@ -401,7 +401,8 @@ static const struct rpc_call_ops nfs_rename_ops = { 
 */

static struct rpc_task *

nfs_async_rename(struct inode *old_dir, struct inode *new_dir,

		 struct dentry *old_dentry, struct dentry *new_dentry)

		 struct dentry *old_dentry, struct dentry *new_dentry,

		 void (*complete)(struct rpc_task *, struct nfs_renamedata *))

{

	struct nfs_renamedata *data;

	struct rpc_message msg = { };
@@ -438,6 +439,7 @@ nfs_async_rename(struct inode *old_dir, struct inode *new_dir, 
	data->new_dentry = dget(new_dentry);

	nfs_fattr_init(&data->old_fattr);

	nfs_fattr_init(&data->new_fattr);

	data->complete = complete;



	/* set up nfs_renameargs */

	data->args.old_dir = NFS_FH(old_dir);
@@ -456,6 +458,17 @@ nfs_async_rename(struct inode *old_dir, struct inode *new_dir, 
	return rpc_run_task(&task_setup_data);

}



/*

 * Perform tasks needed when a sillyrename is done such as cancelling the

 * queued async unlink if it failed.

 */

static void

nfs_complete_sillyrename(struct rpc_task *task, struct nfs_renamedata *data)

{

	if (task->tk_status != 0)

		nfs_cancel_async_unlink(data->old_dentry);

}



#define SILLYNAME_PREFIX ".nfs"

#define SILLYNAME_PREFIX_LEN ((unsigned)sizeof(SILLYNAME_PREFIX) - 1)

#define SILLYNAME_FILEID_LEN ((unsigned)sizeof(u64) << 1)
@@ -548,7 +561,8 @@ nfs_sillyrename(struct inode *dir, struct dentry *dentry) 
	}



	/* run the rename task, undo unlink if it fails */

	task = nfs_async_rename(dir, dir, dentry, sdentry);

	task = nfs_async_rename(dir, dir, dentry, sdentry,

					nfs_complete_sillyrename);

	if (IS_ERR(task)) {

		error = -EBUSY;

		nfs_cancel_async_unlink(dentry);

include/linux/nfs_xdr.h

+1 −0
Original line number Diff line number Diff line
@@ -1397,6 +1397,7 @@ struct nfs_renamedata { 
	struct inode		*new_dir;

	struct dentry		*new_dentry;

	struct nfs_fattr	new_fattr;

	void (*complete)(struct rpc_task *, struct nfs_renamedata *);

};



struct nfs_access_entry;