public inbox for linux-nfs@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/1] SQUASHME: pnfs-submit: avoid NULL dereference in filelayout_commit dprintk
@ 2010-06-13 19:06 Fred Isaman
  2010-06-15  0:07 ` Benny Halevy
  0 siblings, 1 reply; 2+ messages in thread
From: Fred Isaman @ 2010-06-13 19:06 UTC (permalink / raw)
  To: linux-nfs

ds_nfs_client will be NULL when filelayout_commit is called.

Signed-off-by: Fred Isaman <iisaman@netapp.com>
---
 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


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH 1/1] SQUASHME: pnfs-submit: avoid NULL dereference in filelayout_commit dprintk
  2010-06-13 19:06 [PATCH 1/1] SQUASHME: pnfs-submit: avoid NULL dereference in filelayout_commit dprintk Fred Isaman
@ 2010-06-15  0:07 ` Benny Halevy
  0 siblings, 0 replies; 2+ messages in thread
From: Benny Halevy @ 2010-06-15  0:07 UTC (permalink / raw)
  To: Fred Isaman; +Cc: linux-nfs

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

Thanks!

Benny

On Jun. 13, 2010, 15:06 -0400, Fred Isaman <iisaman@netapp.com> wrote:
> ds_nfs_client will be NULL when filelayout_commit is called.
> 
> Signed-off-by: Fred Isaman <iisaman@netapp.com>
> ---
>  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) *

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-06-15  0:07 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-13 19:06 [PATCH 1/1] SQUASHME: pnfs-submit: avoid NULL dereference in filelayout_commit dprintk Fred Isaman
2010-06-15  0:07 ` Benny Halevy

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox