nfs: change end of line commas to semicolons
Subsystems (2)
PATCH 1/1 nfs: change end of line commas to semicolons
Fix a copy-paste error from a previous code reorg.
Signed-off-by Fred Isaman <[email protected]>
Signed-off-by Benny Halevy <[email protected]>
--- fs/nfs/nfs4proc.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
fs/nfs/nfs4proc.c +6 -6
@@ -1984,8 +1984,8 @@ int nfs4_do_close(struct path *path, struct nfs4_state *state, gfp_t gfp_mask, ipath_get (path); calldata->path = *path; - msg.rpc_argp = &calldata->arg, - msg.rpc_resp = &calldata->res, + msg.rpc_argp = &calldata->arg; + msg.rpc_resp = &calldata->res; task_setup_data.callback_data = calldata; task =rpc_run_task (&task_setup_data);if (IS_ERR (task))
@@ -3908,8 +3908,8 @@ static struct rpc_task *nfs4_do_unlck(struct file_lock *fl,return ERR_PTR (-ENOMEM ); } - msg.rpc_argp = &data->arg, - msg.rpc_resp = &data->res, + msg.rpc_argp = &data->arg; + msg.rpc_resp = &data->res; task_setup_data.callback_data = 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 ; task_setup_data.callback_ops = &nfs4_recover_lock_ops; } - msg.rpc_argp = &data->arg, - msg.rpc_resp = &data->res, + msg.rpc_argp = &data->arg; + msg.rpc_resp = &data->res; task_setup_data.callback_data = data; task =rpc_run_task (&task_setup_data);if (IS_ERR (task))
Signature · 1 line
1.7.2.1
Quoted 4 lines · Fred Isaman
Fix a copy-paste error from a previous code reorg.
Signed-off-by Fred Isaman <[email protected]>Signed-off-by Benny Halevy <[email protected]>
Yes. I'm aware of those bugs, and have already committed the following patch:
-------------------------------------------------------------------------------
NFSv4: Convert a few commas into semicolons...
From: Trond Myklebust <[email protected]>
Signed-off-by Trond Myklebust <[email protected]>
---
fs/nfs/nfs4proc.c | 16 ++++++++-------- fs/nfs/unlink.c | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-)
fs/nfs/nfs4proc.c +8 -8
@@ -1984,8 +1984,8 @@ int nfs4_do_close(struct path *path, struct nfs4_state *state, gfp_t gfp_mask, ipath_get (path); calldata->path = *path; - msg.rpc_argp = &calldata->arg, - msg.rpc_resp = &calldata->res, + msg.rpc_argp = &calldata->arg; + msg.rpc_resp = &calldata->res; task_setup_data.callback_data = calldata; task =rpc_run_task (&task_setup_data);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 ; task_setup_data.callback_data = data; - msg.rpc_argp = &data->args, - msg.rpc_resp = &data->res, + msg.rpc_argp = &data->args; + msg.rpc_resp = &data->res; task =rpc_run_task (&task_setup_data);if (IS_ERR (task))return PTR_ERR (task);
@@ -3909,8 +3909,8 @@ static struct rpc_task *nfs4_do_unlck(struct file_lock *fl,return ERR_PTR (-ENOMEM ); } - msg.rpc_argp = &data->arg, - msg.rpc_resp = &data->res, + msg.rpc_argp = &data->arg; + msg.rpc_resp = &data->res; task_setup_data.callback_data = data;return rpc_run_task (&task_setup_data); }
@@ -4147,8 +4147,8 @@ static int _nfs4_do_setlk(struct nfs4_state *state, int cmd, struct file_lock *f data->arg.reclaim =NFS_LOCK_RECLAIM ; task_setup_data.callback_ops = &nfs4_recover_lock_ops; } - msg.rpc_argp = &data->arg, - msg.rpc_resp = &data->res, + msg.rpc_argp = &data->arg; + msg.rpc_resp = &data->res; task_setup_data.callback_data = data; task =rpc_run_task (&task_setup_data);if (IS_ERR (task))
fs/nfs/unlink.c +1 -1
@@ -429,7 +429,7 @@ nfs_async_rename(struct inode *old_dir, struct inode *new_dir, data =kzalloc (sizeof (*data),GFP_KERNEL );if (data ==NULL )return ERR_PTR (-ENOMEM ); - task_setup_data.callback_data = data, + task_setup_data.callback_data = data; data->cred =rpc_lookup_cred ();if (IS_ERR (data->cred)) {
Signature · 6 lines
Trond Myklebust Linux NFS client maintainer NetApp [email protected] www.netapp.com