Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 308540
b: refs/heads/master
c: cd12ae3
h: refs/heads/master
v: v3
  • Loading branch information
Fred Isaman authored and Trond Myklebust committed Apr 27, 2012
1 parent b54e814 commit b7b233b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c5996c4efb95bbb80a25acc890357c9eae998eeb
refs/heads/master: cd12ae326f5c040f61d64233514609adabe84ab8
16 changes: 8 additions & 8 deletions trunk/fs/nfs/nfs4filelayout.c
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ filelayout_set_layoutcommit(struct nfs_write_data *wdata)
*/
static void filelayout_read_prepare(struct rpc_task *task, void *data)
{
struct nfs_read_data *rdata = (struct nfs_read_data *)data;
struct nfs_read_data *rdata = data;

rdata->read_done_cb = filelayout_read_done_cb;

Expand All @@ -205,7 +205,7 @@ static void filelayout_read_prepare(struct rpc_task *task, void *data)

static void filelayout_read_call_done(struct rpc_task *task, void *data)
{
struct nfs_read_data *rdata = (struct nfs_read_data *)data;
struct nfs_read_data *rdata = data;

dprintk("--> %s task->tk_status %d\n", __func__, task->tk_status);

Expand All @@ -215,14 +215,14 @@ static void filelayout_read_call_done(struct rpc_task *task, void *data)

static void filelayout_read_count_stats(struct rpc_task *task, void *data)
{
struct nfs_read_data *rdata = (struct nfs_read_data *)data;
struct nfs_read_data *rdata = data;

rpc_count_iostats(task, NFS_SERVER(rdata->inode)->client->cl_metrics);
}

static void filelayout_read_release(void *data)
{
struct nfs_read_data *rdata = (struct nfs_read_data *)data;
struct nfs_read_data *rdata = data;

put_lseg(rdata->lseg);
rdata->mds_ops->rpc_release(data);
Expand Down Expand Up @@ -282,7 +282,7 @@ static int filelayout_commit_done_cb(struct rpc_task *task,

static void filelayout_write_prepare(struct rpc_task *task, void *data)
{
struct nfs_write_data *wdata = (struct nfs_write_data *)data;
struct nfs_write_data *wdata = data;

if (nfs41_setup_sequence(wdata->ds_clp->cl_session,
&wdata->args.seq_args, &wdata->res.seq_res,
Expand All @@ -294,22 +294,22 @@ static void filelayout_write_prepare(struct rpc_task *task, void *data)

static void filelayout_write_call_done(struct rpc_task *task, void *data)
{
struct nfs_write_data *wdata = (struct nfs_write_data *)data;
struct nfs_write_data *wdata = data;

/* Note this may cause RPC to be resent */
wdata->mds_ops->rpc_call_done(task, data);
}

static void filelayout_write_count_stats(struct rpc_task *task, void *data)
{
struct nfs_write_data *wdata = (struct nfs_write_data *)data;
struct nfs_write_data *wdata = data;

rpc_count_iostats(task, NFS_SERVER(wdata->inode)->client->cl_metrics);
}

static void filelayout_write_release(void *data)
{
struct nfs_write_data *wdata = (struct nfs_write_data *)data;
struct nfs_write_data *wdata = data;

put_lseg(wdata->lseg);
wdata->mds_ops->rpc_release(data);
Expand Down

0 comments on commit b7b233b

Please sign in to comment.