2010-06-13 19:06:45

by Fred Isaman

Subject: [PATCH 1/1] SQUASHME: pnfs-submit: avoid NULL dereference in filelayout_commit dprintk

ds_nfs_client will be NULL when filelayout_commit is called.

Signed-off-by: Fred Isaman <[email protected]>
---
fs/nfs/nfs4filelayout.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c
index b82e4ff..e6d45b8 100644
--- a/fs/nfs/nfs4filelayout.c
+++ b/fs/nfs/nfs4filelayout.c
@@ -569,8 +569,7 @@ filelayout_commit(struct pnfs_layout_type *layoutid, int sync,
struct nfs_write_data *dsdata;
struct nfs4_pnfs_ds *ds;

- dprintk("%s data %p pnfs_client %p sync %d\n",
- __func__, data, data->fldata.ds_nfs_client->cl_rpcclient, sync);
+ dprintk("%s data %p sync %d\n", __func__, data, sync);

/* Alloc room for both in one go */
ds_page_list = kzalloc((NFS4_PNFS_MAX_MULTI_CNT + 1) *
--
1.6.6.1

2010-06-15 00:07:26

by Benny Halevy

Subject: Re: [PATCH 1/1] SQUASHME: pnfs-submit: avoid NULL dereference in filelayout_commit dprintk

Merged at pnfs-all-2.6.35-rc3-2010-06-14

Thanks!

Benny

On Jun. 13, 2010, 15:06 -0400, Fred Isaman <[email protected]> wrote:
> ds_nfs_client will be NULL when filelayout_commit is called.
>
> Signed-off-by: Fred Isaman <[email protected]>
> ---
> fs/nfs/nfs4filelayout.c | 3 +--
> 1 files changed, 1 insertions(+), 2 deletions(-)
>
> diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c
> index b82e4ff..e6d45b8 100644
> --- a/fs/nfs/nfs4filelayout.c
> +++ b/fs/nfs/nfs4filelayout.c
> @@ -569,8 +569,7 @@ filelayout_commit(struct pnfs_layout_type *layoutid, int sync,
> struct nfs_write_data *dsdata;
> struct nfs4_pnfs_ds *ds;
>
> - dprintk("%s data %p pnfs_client %p sync %d\n",
> - __func__, data, data->fldata.ds_nfs_client->cl_rpcclient, sync);
> + dprintk("%s data %p sync %d\n", __func__, data, sync);
>
> /* Alloc room for both in one go */
> ds_page_list = kzalloc((NFS4_PNFS_MAX_MULTI_CNT + 1) *