2010-12-07 22:44:38

by Peter Huewe

[permalink] [raw]
Subject: [PATCH] staging/zram: Fix sparse warning 'Using plain integer as NULL pointer'

This patch fixes the warning generated by sparse: "Using plain integer
as NULL pointer" by replacing the offending 0s with NULL.

Signed-off-by: Peter Huewe <[email protected]>
---
KernelVersion: linux-next-20101207

drivers/staging/zram/xvmalloc.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/zram/xvmalloc.c b/drivers/staging/zram/xvmalloc.c
index 3fdbb8a..b644067 100644
--- a/drivers/staging/zram/xvmalloc.c
+++ b/drivers/staging/zram/xvmalloc.c
@@ -187,7 +187,7 @@ static void insert_block(struct xv_pool *pool, struct page *page, u32 offset,
slindex = get_index_for_insert(block->size);
flindex = slindex / BITS_PER_LONG;

- block->link.prev_page = 0;
+ block->link.prev_page = NULL;
block->link.prev_offset = 0;
block->link.next_page = pool->freelist[slindex].page;
block->link.next_offset = pool->freelist[slindex].offset;
@@ -217,7 +217,7 @@ static void remove_block_head(struct xv_pool *pool,

pool->freelist[slindex].page = block->link.next_page;
pool->freelist[slindex].offset = block->link.next_offset;
- block->link.prev_page = 0;
+ block->link.prev_page = NULL;
block->link.prev_offset = 0;

if (!pool->freelist[slindex].page) {
@@ -232,7 +232,7 @@ static void remove_block_head(struct xv_pool *pool,
*/
tmpblock = get_ptr_atomic(pool->freelist[slindex].page,
pool->freelist[slindex].offset, KM_USER1);
- tmpblock->link.prev_page = 0;
+ tmpblock->link.prev_page = NULL;
tmpblock->link.prev_offset = 0;
put_ptr_atomic(tmpblock, KM_USER1);
}
--
1.7.2.2


2010-12-07 23:09:28

by Nitin Gupta

[permalink] [raw]
Subject: Re: [PATCH] staging/zram: Fix sparse warning 'Using plain integer as NULL pointer'

On 12/7/2010 5:44 PM, Peter Huewe wrote:
> This patch fixes the warning generated by sparse: "Using plain integer
> as NULL pointer" by replacing the offending 0s with NULL.
>
> Signed-off-by: Peter Huewe <[email protected]>

Thanks for the fix. I see that it's already fixed in the
project internal repo but I somehow missed sending it to
mainline.

Nitin

2010-12-08 22:37:57

by Greg KH

[permalink] [raw]
Subject: Re: [PATCH] staging/zram: Fix sparse warning 'Using plain integer as NULL pointer'

On Tue, Dec 07, 2010 at 06:09:22PM -0500, Nitin Gupta wrote:
> On 12/7/2010 5:44 PM, Peter Huewe wrote:
> > This patch fixes the warning generated by sparse: "Using plain integer
> > as NULL pointer" by replacing the offending 0s with NULL.
> >
> > Signed-off-by: Peter Huewe <[email protected]>
>
> Thanks for the fix. I see that it's already fixed in the
> project internal repo but I somehow missed sending it to
> mainline.

Are you ever going to sync your internal repo with the in-kernel one, or
should I just delete the in-kernel one?

thanks,

greg k-h

2010-12-08 22:47:32

by Nitin Gupta

[permalink] [raw]
Subject: Re: [PATCH] staging/zram: Fix sparse warning 'Using plain integer as NULL pointer'

On 12/8/2010 5:30 PM, Greg KH wrote:
> On Tue, Dec 07, 2010 at 06:09:22PM -0500, Nitin Gupta wrote:
>> On 12/7/2010 5:44 PM, Peter Huewe wrote:
>>> This patch fixes the warning generated by sparse: "Using plain integer
>>> as NULL pointer" by replacing the offending 0s with NULL.
>>>
>>> Signed-off-by: Peter Huewe <[email protected]>
>>
>> Thanks for the fix. I see that it's already fixed in the
>> project internal repo but I somehow missed sending it to
>> mainline.
>
> Are you ever going to sync your internal repo with the in-kernel one, or
> should I just delete the in-kernel one?
>


It is almost sync'ed up (apart from "scalability enhancements") but I
somehow missed this part. Currently, I'm completely occupied with
final exams due next week. So, please be patient.

I plan to completely discard scalability part and solve outstanding
crash reports (http://code.google.com/p/compcache/issues/list) once
this school overhead is over.

Thanks,
Nitin