* [PATCH] pNFS: Handle allocation errors correctly in objlayout_alloc_layout_hdr()
@ 2014-05-30 0:29 Trond Myklebust
2014-06-01 9:10 ` Boaz Harrosh
0 siblings, 1 reply; 2+ messages in thread
From: Trond Myklebust @ 2014-05-30 0:29 UTC (permalink / raw)
To: linux-nfs; +Cc: Boaz Harrosh
Return the NULL pointer when the allocation fails.
Cc: Boaz Harrosh <bharrosh@panasas.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
---
fs/nfs/objlayout/objlayout.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/fs/nfs/objlayout/objlayout.c b/fs/nfs/objlayout/objlayout.c
index 2f955f671003..765d3f54e986 100644
--- a/fs/nfs/objlayout/objlayout.c
+++ b/fs/nfs/objlayout/objlayout.c
@@ -53,10 +53,10 @@ objlayout_alloc_layout_hdr(struct inode *inode, gfp_t gfp_flags)
struct objlayout *objlay;
objlay = kzalloc(sizeof(struct objlayout), gfp_flags);
- if (objlay) {
- spin_lock_init(&objlay->lock);
- INIT_LIST_HEAD(&objlay->err_list);
- }
+ if (!objlay)
+ return NULL;
+ spin_lock_init(&objlay->lock);
+ INIT_LIST_HEAD(&objlay->err_list);
dprintk("%s: Return %p\n", __func__, objlay);
return &objlay->pnfs_layout;
}
--
1.9.3
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] pNFS: Handle allocation errors correctly in objlayout_alloc_layout_hdr()
2014-05-30 0:29 [PATCH] pNFS: Handle allocation errors correctly in objlayout_alloc_layout_hdr() Trond Myklebust
@ 2014-06-01 9:10 ` Boaz Harrosh
0 siblings, 0 replies; 2+ messages in thread
From: Boaz Harrosh @ 2014-06-01 9:10 UTC (permalink / raw)
To: Trond Myklebust, linux-nfs; +Cc: Boaz Harrosh
On 05/30/2014 03:29 AM, Trond Myklebust wrote:
> Return the NULL pointer when the allocation fails.
>
> Cc: Boaz Harrosh <bharrosh@panasas.com>
> Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
> ---
> fs/nfs/objlayout/objlayout.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/fs/nfs/objlayout/objlayout.c b/fs/nfs/objlayout/objlayout.c
> index 2f955f671003..765d3f54e986 100644
> --- a/fs/nfs/objlayout/objlayout.c
> +++ b/fs/nfs/objlayout/objlayout.c
> @@ -53,10 +53,10 @@ objlayout_alloc_layout_hdr(struct inode *inode, gfp_t gfp_flags)
> struct objlayout *objlay;
>
> objlay = kzalloc(sizeof(struct objlayout), gfp_flags);
> - if (objlay) {
> - spin_lock_init(&objlay->lock);
> - INIT_LIST_HEAD(&objlay->err_list);
> - }
> + if (!objlay)
> + return NULL;
> + spin_lock_init(&objlay->lock);
> + INIT_LIST_HEAD(&objlay->err_list);
> dprintk("%s: Return %p\n", __func__, objlay);
> return &objlay->pnfs_layout;
> }
>
Thanks! ACK
BTW it was not a bug. &NULL->pnfs_layout will return 0 because it is at offset 0.
Which explains why it works.
Thanks again, good catch
Boaz
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-06-01 9:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-30 0:29 [PATCH] pNFS: Handle allocation errors correctly in objlayout_alloc_layout_hdr() Trond Myklebust
2014-06-01 9:10 ` Boaz Harrosh
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).