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

Commit 1174dd1f authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4: Convert a few commas into semicolons... 



Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent b3bcedad

fs/nfs/nfs4proc.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -1984,8 +1984,8 @@ int nfs4_do_close(struct path *path, struct nfs4_state *state, gfp_t gfp_mask, i 
	path_get(path);

	path_get(path);

	calldata->path = *path;

	calldata->path = *path;





	msg.rpc_argp = &calldata->arg,

	msg.rpc_argp = &calldata->arg;

	msg.rpc_resp = &calldata->res,

	msg.rpc_resp = &calldata->res;

	task_setup_data.callback_data = calldata;

	task_setup_data.callback_data = calldata;

	task = rpc_run_task(&task_setup_data);

	task = rpc_run_task(&task_setup_data);

	if (IS_ERR(task))

	if (IS_ERR(task))
@@ -3663,8 +3663,8 @@ static int _nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, co 
	data->rpc_status = 0;

	data->rpc_status = 0;





	task_setup_data.callback_data = data;

	task_setup_data.callback_data = data;

	msg.rpc_argp = &data->args,

	msg.rpc_argp = &data->args;

	msg.rpc_resp = &data->res,

	msg.rpc_resp = &data->res;

	task = rpc_run_task(&task_setup_data);

	task = rpc_run_task(&task_setup_data);

	if (IS_ERR(task))

	if (IS_ERR(task))

		return PTR_ERR(task);

		return PTR_ERR(task);
@@ -3908,8 +3908,8 @@ static struct rpc_task *nfs4_do_unlck(struct file_lock *fl, 
		return ERR_PTR(-ENOMEM);

		return ERR_PTR(-ENOMEM);

	}

	}





	msg.rpc_argp = &data->arg,

	msg.rpc_argp = &data->arg;

	msg.rpc_resp = &data->res,

	msg.rpc_resp = &data->res;

	task_setup_data.callback_data = data;

	task_setup_data.callback_data = data;

	return rpc_run_task(&task_setup_data);

	return rpc_run_task(&task_setup_data);

}

}
@@ -4145,8 +4145,8 @@ static int _nfs4_do_setlk(struct nfs4_state *state, int cmd, struct file_lock *f 
			data->arg.reclaim = NFS_LOCK_RECLAIM;

			data->arg.reclaim = NFS_LOCK_RECLAIM;

		task_setup_data.callback_ops = &nfs4_recover_lock_ops;

		task_setup_data.callback_ops = &nfs4_recover_lock_ops;

	}

	}

	msg.rpc_argp = &data->arg,

	msg.rpc_argp = &data->arg;

	msg.rpc_resp = &data->res,

	msg.rpc_resp = &data->res;

	task_setup_data.callback_data = data;

	task_setup_data.callback_data = data;

	task = rpc_run_task(&task_setup_data);

	task = rpc_run_task(&task_setup_data);

	if (IS_ERR(task))

	if (IS_ERR(task))

fs/nfs/unlink.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -429,7 +429,7 @@ nfs_async_rename(struct inode *old_dir, struct inode *new_dir, 
	data = kzalloc(sizeof(*data), GFP_KERNEL);

	data = kzalloc(sizeof(*data), GFP_KERNEL);

	if (data == NULL)

	if (data == NULL)

		return ERR_PTR(-ENOMEM);

		return ERR_PTR(-ENOMEM);

	task_setup_data.callback_data = data,

	task_setup_data.callback_data = data;





	data->cred = rpc_lookup_cred();

	data->cred = rpc_lookup_cred();

	if (IS_ERR(data->cred)) {

	if (IS_ERR(data->cred)) {