| Message ID | 1303320436-21258-1-git-send-email-bhalevy@panasas.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, 2011-04-20 at 20:27 +0300, Benny Halevy wrote: > From: Andy Adamson <andros@netapp.com> > > Signed-off-by: Andy Adamson <andros@netapp.com> > Signed-off-by: Benny Halevy <bhalevy@panasas.com> > --- > fs/nfs/nfs4proc.c | 2 ++ > fs/nfs/nfs4xdr.c | 1 + > fs/nfs/pnfs.c | 21 +++++++++++++++++++++ > fs/nfs/pnfs.h | 8 ++++++++ > include/linux/nfs_xdr.h | 1 + > 5 files changed, 33 insertions(+), 0 deletions(-) > > diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c > index b4df7a6..d0eb50b 100644 > --- a/fs/nfs/nfs4proc.c > +++ b/fs/nfs/nfs4proc.c > @@ -5807,6 +5807,7 @@ static void nfs4_layoutcommit_prepare(struct rpc_task *task, void *calldata) > if (nfs4_setup_sequence(server, &data->args.seq_args, > &data->res.seq_res, 1, task)) > return; > + data->res.status = -1; > rpc_call_start(task); > } > > @@ -5841,6 +5842,7 @@ static void nfs4_layoutcommit_release(void *calldata) > { > struct nfs4_layoutcommit_data *data = calldata; > > + pnfs_cleanup_layoutcommit(data->args.inode, data); > /* Matched by references in pnfs_set_layoutcommit */ > put_lseg(data->lseg); > put_rpccred(data->cred); > diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c > index 4f7bef9..23e608f 100644 > --- a/fs/nfs/nfs4xdr.c > +++ b/fs/nfs/nfs4xdr.c > @@ -5307,6 +5307,7 @@ static int decode_layoutcommit(struct xdr_stream *xdr, > int status; > > status = decode_op_hdr(xdr, OP_LAYOUTCOMMIT); > + res->status = status; > if (status) > return status; > > diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c > index 0b4ad1f..a5050d2 100644 > --- a/fs/nfs/pnfs.c > +++ b/fs/nfs/pnfs.c > @@ -1181,6 +1181,19 @@ pnfs_try_to_read_data(struct nfs_read_data *rdata, > return trypnfs; > } > > +void pnfs_cleanup_layoutcommit(struct inode *inode, > + struct nfs4_layoutcommit_data *data) > +{ > + struct nfs_server *nfss = NFS_SERVER(inode); > + > + /* TODO: Maybe we should avoid this by allowing the layout driver > + * to directly xdr its layout on the wire. > + */ > + if (nfss->pnfs_curr_ld->cleanup_layoutcommit) > + nfss->pnfs_curr_ld->cleanup_layoutcommit( > + NFS_I(inode)->layout, data); > +} > + > /* > * Currently there is only one (whole file) write lseg. > */ > @@ -1277,6 +1290,14 @@ pnfs_layoutcommit_inode(struct inode *inode, bool sync) > data->args.lastbytewritten = end_pos - 1; > data->res.server = NFS_SERVER(inode); > > + /* Call layout driver to set the arguments */ > + if (NFS_SERVER(inode)->pnfs_curr_ld->setup_layoutcommit) { > + status = NFS_SERVER(inode)->pnfs_curr_ld->setup_layoutcommit( > + NFS_I(inode)->layout, &data->args); > + if (status) > + goto out; > + } > + > status = nfs4_proc_layoutcommit(data, sync); > out: > dprintk("<-- %s status %d\n", __func__, status); > diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h > index 011885e..9f8e970 100644 > --- a/fs/nfs/pnfs.h > +++ b/fs/nfs/pnfs.h > @@ -99,10 +99,16 @@ struct pnfs_layoutdriver_type { > /* device notification methods */ > void (*delete_deviceid)(struct nfs4_deviceid *); > > + int (*setup_layoutcommit) (struct pnfs_layout_hdr *layoutid, > + struct nfs4_layoutcommit_args *args); > + > void (*encode_layoutcommit) (struct pnfs_layout_hdr *layoutid, > struct xdr_stream *xdr, > const struct nfs4_layoutcommit_args *args); > > + void (*cleanup_layoutcommit) (struct pnfs_layout_hdr *layoutid, > + struct nfs4_layoutcommit_data *data); > + This is yet more callback ugliness. Please replace this + the encode_layoutcommit+.... with a single int (*layoutcommit) (struct pnfs_layout_hdr) that does everything from pre- and post-processing to the actual RPC call for layoutcommit.
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index b4df7a6..d0eb50b 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -5807,6 +5807,7 @@ static void nfs4_layoutcommit_prepare(struct rpc_task *task, void *calldata) if (nfs4_setup_sequence(server, &data->args.seq_args, &data->res.seq_res, 1, task)) return; + data->res.status = -1; rpc_call_start(task); } @@ -5841,6 +5842,7 @@ static void nfs4_layoutcommit_release(void *calldata) { struct nfs4_layoutcommit_data *data = calldata; + pnfs_cleanup_layoutcommit(data->args.inode, data); /* Matched by references in pnfs_set_layoutcommit */ put_lseg(data->lseg); put_rpccred(data->cred); diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index 4f7bef9..23e608f 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c @@ -5307,6 +5307,7 @@ static int decode_layoutcommit(struct xdr_stream *xdr, int status; status = decode_op_hdr(xdr, OP_LAYOUTCOMMIT); + res->status = status; if (status) return status; diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 0b4ad1f..a5050d2 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -1181,6 +1181,19 @@ pnfs_try_to_read_data(struct nfs_read_data *rdata, return trypnfs; } +void pnfs_cleanup_layoutcommit(struct inode *inode, + struct nfs4_layoutcommit_data *data) +{ + struct nfs_server *nfss = NFS_SERVER(inode); + + /* TODO: Maybe we should avoid this by allowing the layout driver + * to directly xdr its layout on the wire. + */ + if (nfss->pnfs_curr_ld->cleanup_layoutcommit) + nfss->pnfs_curr_ld->cleanup_layoutcommit( + NFS_I(inode)->layout, data); +} + /* * Currently there is only one (whole file) write lseg. */ @@ -1277,6 +1290,14 @@ pnfs_layoutcommit_inode(struct inode *inode, bool sync) data->args.lastbytewritten = end_pos - 1; data->res.server = NFS_SERVER(inode); + /* Call layout driver to set the arguments */ + if (NFS_SERVER(inode)->pnfs_curr_ld->setup_layoutcommit) { + status = NFS_SERVER(inode)->pnfs_curr_ld->setup_layoutcommit( + NFS_I(inode)->layout, &data->args); + if (status) + goto out; + } + status = nfs4_proc_layoutcommit(data, sync); out: dprintk("<-- %s status %d\n", __func__, status); diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h index 011885e..9f8e970 100644 --- a/fs/nfs/pnfs.h +++ b/fs/nfs/pnfs.h @@ -99,10 +99,16 @@ struct pnfs_layoutdriver_type { /* device notification methods */ void (*delete_deviceid)(struct nfs4_deviceid *); + int (*setup_layoutcommit) (struct pnfs_layout_hdr *layoutid, + struct nfs4_layoutcommit_args *args); + void (*encode_layoutcommit) (struct pnfs_layout_hdr *layoutid, struct xdr_stream *xdr, const struct nfs4_layoutcommit_args *args); + void (*cleanup_layoutcommit) (struct pnfs_layout_hdr *layoutid, + struct nfs4_layoutcommit_data *data); + void (*encode_layoutreturn) (struct pnfs_layout_hdr *layoutid, struct xdr_stream *xdr, const struct nfs4_layoutreturn_args *args); @@ -151,6 +157,8 @@ enum pnfs_try_status pnfs_try_to_write_data(struct nfs_write_data *, const struct rpc_call_ops *, int); enum pnfs_try_status pnfs_try_to_read_data(struct nfs_read_data *, const struct rpc_call_ops *); +void pnfs_cleanup_layoutcommit(struct inode *, + struct nfs4_layoutcommit_data *); void pnfs_pageio_init_read(struct nfs_pageio_descriptor *, struct inode *); void pnfs_pageio_init_write(struct nfs_pageio_descriptor *, struct inode *); int pnfs_layout_process(struct nfs4_layoutget *lgp); diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h index 455ddfb..01eb1ae 100644 --- a/include/linux/nfs_xdr.h +++ b/include/linux/nfs_xdr.h @@ -255,6 +255,7 @@ struct nfs4_layoutcommit_res { struct nfs_fattr *fattr; const struct nfs_server *server; struct nfs4_sequence_res seq_res; + int status; }; struct nfs4_layoutcommit_data {