On 2011-07-04 04:30, Peng Tao wrote:
> There is no need to keep lseg reference when read/write through MDS.
> This fixes a null pointer crash at nfs_post_op_update_inode_force_wcc
> because nfs4_proc_write_setup will unset wdata->res.fattr if wdata->lseg
> is not NULL.
>
> Signed-off-by: Peng Tao <peng_tao@xxxxxxx>
Looks good to me.
Benny
> ---
> fs/nfs/pnfs.c | 6 ++++++
> 1 files changed, 6 insertions(+), 0 deletions(-)
>
> diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
> index 30a0394..55fdf02 100644
> --- a/fs/nfs/pnfs.c
> +++ b/fs/nfs/pnfs.c
> @@ -1193,6 +1193,9 @@ pnfs_ld_write_done(struct nfs_write_data *data)
>
> dprintk("%s: pnfs_error=%d, retry via MDS\n", __func__,
> data->pnfs_error);
> +
> + put_lseg(data->lseg);
> + data->lseg = NULL;
> status = nfs_initiate_write(data, NFS_CLIENT(data->inode),
> data->mds_ops, NFS_FILE_SYNC);
> return status ? : -EAGAIN;
> @@ -1240,6 +1243,9 @@ pnfs_ld_read_done(struct nfs_read_data *data)
>
> dprintk("%s: pnfs_error=%d, retry via MDS\n", __func__,
> data->pnfs_error);
> +
> + put_lseg(data->lseg);
> + data->lseg = NULL;
> status = nfs_initiate_read(data, NFS_CLIENT(data->inode),
> data->mds_ops);
> return status ? : -EAGAIN;
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
