aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2010-12-21 10:52:24 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2010-12-21 11:51:27 -0500
commit1174dd1f890b7f8be8ec6a7071657fe8f59e18b7 (patch)
tree5db2ae27fa8b332d7e07fe927f55f20bab50d8fe
parentb3bcedadf23264c3b7afcbfbfe1965a17ef1352c (diff)
NFSv4: Convert a few commas into semicolons...
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r--fs/nfs/nfs4proc.c16
-rw-r--r--fs/nfs/unlink.c2
2 files changed, 9 insertions, 9 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 494c68739ff4..78b08993a38b 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -1984,8 +1984,8 @@ int nfs4_do_close(struct path *path, struct nfs4_state *state, gfp_t gfp_mask, i
1984 path_get(path); 1984 path_get(path);
1985 calldata->path = *path; 1985 calldata->path = *path;
1986 1986
1987 msg.rpc_argp = &calldata->arg, 1987 msg.rpc_argp = &calldata->arg;
1988 msg.rpc_resp = &calldata->res, 1988 msg.rpc_resp = &calldata->res;
1989 task_setup_data.callback_data = calldata; 1989 task_setup_data.callback_data = calldata;
1990 task = rpc_run_task(&task_setup_data); 1990 task = rpc_run_task(&task_setup_data);
1991 if (IS_ERR(task)) 1991 if (IS_ERR(task))
@@ -3663,8 +3663,8 @@ static int _nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, co
3663 data->rpc_status = 0; 3663 data->rpc_status = 0;
3664 3664
3665 task_setup_data.callback_data = data; 3665 task_setup_data.callback_data = data;
3666 msg.rpc_argp = &data->args, 3666 msg.rpc_argp = &data->args;
3667 msg.rpc_resp = &data->res, 3667 msg.rpc_resp = &data->res;
3668 task = rpc_run_task(&task_setup_data); 3668 task = rpc_run_task(&task_setup_data);
3669 if (IS_ERR(task)) 3669 if (IS_ERR(task))
3670 return PTR_ERR(task); 3670 return PTR_ERR(task);
@@ -3908,8 +3908,8 @@ static struct rpc_task *nfs4_do_unlck(struct file_lock *fl,
3908 return ERR_PTR(-ENOMEM); 3908 return ERR_PTR(-ENOMEM);
3909 } 3909 }
3910 3910
3911 msg.rpc_argp = &data->arg, 3911 msg.rpc_argp = &data->arg;
3912 msg.rpc_resp = &data->res, 3912 msg.rpc_resp = &data->res;
3913 task_setup_data.callback_data = data; 3913 task_setup_data.callback_data = data;
3914 return rpc_run_task(&task_setup_data); 3914 return rpc_run_task(&task_setup_data);
3915} 3915}
@@ -4145,8 +4145,8 @@ static int _nfs4_do_setlk(struct nfs4_state *state, int cmd, struct file_lock *f
4145 data->arg.reclaim = NFS_LOCK_RECLAIM; 4145 data->arg.reclaim = NFS_LOCK_RECLAIM;
4146 task_setup_data.callback_ops = &nfs4_recover_lock_ops; 4146 task_setup_data.callback_ops = &nfs4_recover_lock_ops;
4147 } 4147 }
4148 msg.rpc_argp = &data->arg, 4148 msg.rpc_argp = &data->arg;
4149 msg.rpc_resp = &data->res, 4149 msg.rpc_resp = &data->res;
4150 task_setup_data.callback_data = data; 4150 task_setup_data.callback_data = data;
4151 task = rpc_run_task(&task_setup_data); 4151 task = rpc_run_task(&task_setup_data);
4152 if (IS_ERR(task)) 4152 if (IS_ERR(task))
diff --git a/fs/nfs/unlink.c b/fs/nfs/unlink.c
index 7bdec8531400..3bf1e53c4a3f 100644
--- a/fs/nfs/unlink.c
+++ b/fs/nfs/unlink.c
@@ -429,7 +429,7 @@ nfs_async_rename(struct inode *old_dir, struct inode *new_dir,
429 data = kzalloc(sizeof(*data), GFP_KERNEL); 429 data = kzalloc(sizeof(*data), GFP_KERNEL);
430 if (data == NULL) 430 if (data == NULL)
431 return ERR_PTR(-ENOMEM); 431 return ERR_PTR(-ENOMEM);
432 task_setup_data.callback_data = data, 432 task_setup_data.callback_data = data;
433 433
434 data->cred = rpc_lookup_cred(); 434 data->cred = rpc_lookup_cred();
435 if (IS_ERR(data->cred)) { 435 if (IS_ERR(data->cred)) {