mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-01 06:33:07 +00:00
pnfs: cleanup_layoutcommit
This gives layout driver a chance to cleanup structures they put in at encode_layoutcommit. Signed-off-by: Andy Adamson <andros@netapp.com> [fixup layout header pointer for layoutcommit] Signed-off-by: Benny Halevy <bhalevy@panasas.com> Signed-off-by: Benny Halevy <bhalevy@tonian.com> [rm inode and pnfs_layout_hdr args from cleanup_layoutcommit()] Signed-off-by: Jim Rees <rees@umich.edu> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
parent
dae100c2b1
commit
db29c08909
5 changed files with 14 additions and 0 deletions
|
@ -5963,6 +5963,7 @@ static void nfs4_layoutcommit_release(void *calldata)
|
||||||
struct nfs4_layoutcommit_data *data = calldata;
|
struct nfs4_layoutcommit_data *data = calldata;
|
||||||
struct pnfs_layout_segment *lseg, *tmp;
|
struct pnfs_layout_segment *lseg, *tmp;
|
||||||
|
|
||||||
|
pnfs_cleanup_layoutcommit(data);
|
||||||
/* Matched by references in pnfs_set_layoutcommit */
|
/* Matched by references in pnfs_set_layoutcommit */
|
||||||
list_for_each_entry_safe(lseg, tmp, &data->lseg_list, pls_lc_list) {
|
list_for_each_entry_safe(lseg, tmp, &data->lseg_list, pls_lc_list) {
|
||||||
list_del_init(&lseg->pls_lc_list);
|
list_del_init(&lseg->pls_lc_list);
|
||||||
|
|
|
@ -5599,6 +5599,7 @@ static int decode_layoutcommit(struct xdr_stream *xdr,
|
||||||
int status;
|
int status;
|
||||||
|
|
||||||
status = decode_op_hdr(xdr, OP_LAYOUTCOMMIT);
|
status = decode_op_hdr(xdr, OP_LAYOUTCOMMIT);
|
||||||
|
res->status = status;
|
||||||
if (status)
|
if (status)
|
||||||
return status;
|
return status;
|
||||||
|
|
||||||
|
|
|
@ -1411,6 +1411,14 @@ pnfs_set_layoutcommit(struct nfs_write_data *wdata)
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(pnfs_set_layoutcommit);
|
EXPORT_SYMBOL_GPL(pnfs_set_layoutcommit);
|
||||||
|
|
||||||
|
void pnfs_cleanup_layoutcommit(struct nfs4_layoutcommit_data *data)
|
||||||
|
{
|
||||||
|
struct nfs_server *nfss = NFS_SERVER(data->args.inode);
|
||||||
|
|
||||||
|
if (nfss->pnfs_curr_ld->cleanup_layoutcommit)
|
||||||
|
nfss->pnfs_curr_ld->cleanup_layoutcommit(data);
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* For the LAYOUT4_NFSV4_1_FILES layout type, NFS_DATA_SYNC WRITEs and
|
* For the LAYOUT4_NFSV4_1_FILES layout type, NFS_DATA_SYNC WRITEs and
|
||||||
* NFS_UNSTABLE WRITEs with a COMMIT to data servers must store enough
|
* NFS_UNSTABLE WRITEs with a COMMIT to data servers must store enough
|
||||||
|
|
|
@ -113,6 +113,8 @@ struct pnfs_layoutdriver_type {
|
||||||
struct xdr_stream *xdr,
|
struct xdr_stream *xdr,
|
||||||
const struct nfs4_layoutreturn_args *args);
|
const struct nfs4_layoutreturn_args *args);
|
||||||
|
|
||||||
|
void (*cleanup_layoutcommit) (struct nfs4_layoutcommit_data *data);
|
||||||
|
|
||||||
void (*encode_layoutcommit) (struct pnfs_layout_hdr *layoutid,
|
void (*encode_layoutcommit) (struct pnfs_layout_hdr *layoutid,
|
||||||
struct xdr_stream *xdr,
|
struct xdr_stream *xdr,
|
||||||
const struct nfs4_layoutcommit_args *args);
|
const struct nfs4_layoutcommit_args *args);
|
||||||
|
@ -196,6 +198,7 @@ void pnfs_roc_release(struct inode *ino);
|
||||||
void pnfs_roc_set_barrier(struct inode *ino, u32 barrier);
|
void pnfs_roc_set_barrier(struct inode *ino, u32 barrier);
|
||||||
bool pnfs_roc_drain(struct inode *ino, u32 *barrier);
|
bool pnfs_roc_drain(struct inode *ino, u32 *barrier);
|
||||||
void pnfs_set_layoutcommit(struct nfs_write_data *wdata);
|
void pnfs_set_layoutcommit(struct nfs_write_data *wdata);
|
||||||
|
void pnfs_cleanup_layoutcommit(struct nfs4_layoutcommit_data *data);
|
||||||
int pnfs_layoutcommit_inode(struct inode *inode, bool sync);
|
int pnfs_layoutcommit_inode(struct inode *inode, bool sync);
|
||||||
int _pnfs_return_layout(struct inode *);
|
int _pnfs_return_layout(struct inode *);
|
||||||
int pnfs_ld_write_done(struct nfs_write_data *);
|
int pnfs_ld_write_done(struct nfs_write_data *);
|
||||||
|
|
|
@ -269,6 +269,7 @@ struct nfs4_layoutcommit_res {
|
||||||
struct nfs_fattr *fattr;
|
struct nfs_fattr *fattr;
|
||||||
const struct nfs_server *server;
|
const struct nfs_server *server;
|
||||||
struct nfs4_sequence_res seq_res;
|
struct nfs4_sequence_res seq_res;
|
||||||
|
int status;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct nfs4_layoutcommit_data {
|
struct nfs4_layoutcommit_data {
|
||||||
|
|
Loading…
Reference in a new issue