| Message ID | 1311792048-12551-26-git-send-email-rees@umich.edu (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, 2011-07-27 at 14:40 -0400, Jim Rees wrote: > From: Peng Tao <bergwolf@gmail.com> > > 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@emc.com> > --- > 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 3b20753..fda3019 100644 > --- a/fs/nfs/pnfs.c > +++ b/fs/nfs/pnfs.c > @@ -1182,6 +1182,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); As I've said before: the real bug here is calling nfs_initiate_write()... > return status ? : -EAGAIN; > @@ -1282,6 +1285,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;
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 3b20753..fda3019 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -1182,6 +1182,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; @@ -1282,6 +1285,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;