[PATCH] block: kmalloc args reversed, small function definition fixes

[PATCH] block: kmalloc args reversed, small function definition fixes

[Harvey Harrison]

Noticed by sparse:
block/blk-softirq.c:156:12: warning: symbol 'blk_softirq_init' was not declared. Should it be static?
block/genhd.c:583:28: warning: function 'bdget_disk' with external linkage has definition
block/genhd.c:659:17: warning: incorrect type in argument 1 (different base types)
block/genhd.c:659:17:    expected unsigned int [unsigned] [usertype] size
block/genhd.c:659:17:    got restricted gfp_t
block/genhd.c:659:29: warning: incorrect type in argument 2 (different base types)
block/genhd.c:659:29:    expected restricted gfp_t [usertype] flags
block/genhd.c:659:29:    got unsigned int
block: kmalloc args reversed

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
---
new in next-20080827

 block/blk-settings.c |    2 +-
 block/genhd.c        |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/block/blk-settings.c b/block/blk-settings.c
index a60e959..d70692b 100644
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -443,7 +443,7 @@ void blk_queue_update_dma_alignment(struct request_queue *q, int mask)
 }
 EXPORT_SYMBOL(blk_queue_update_dma_alignment);
 
-int __init blk_settings_init(void)
+static int __init blk_settings_init(void)
 {
 	blk_max_low_pfn = max_low_pfn - 1;
 	blk_max_pfn = max_pfn - 1;
diff --git a/block/genhd.c b/block/genhd.c
index a189358..e2eaaa3 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -580,7 +580,7 @@ struct gendisk *get_gendisk(dev_t devt, int *partno)
  * RETURNS:
  * Resulting block_device on success, NULL on failure.
  */
-extern struct block_device *bdget_disk(struct gendisk *disk, int partno)
+struct block_device *bdget_disk(struct gendisk *disk, int partno)
 {
 	struct hd_struct *part;
 	struct block_device *bdev = NULL;
@@ -656,7 +656,7 @@ static void *disk_seqf_start(struct seq_file *seqf, loff_t *pos)
 	struct class_dev_iter *iter;
 	struct device *dev;
 
-	iter = kmalloc(GFP_KERNEL, sizeof(*iter));
+	iter = kmalloc(sizeof(*iter), GFP_KERNEL);
 	if (!iter)
 		return ERR_PTR(-ENOMEM);
 
-- 
1.6.0.366.gf9ffa8

Re: [PATCH] block: kmalloc args reversed, small function definition fixes

[Jens Axboe]

On Wed, Aug 27 2008, Harvey Harrison wrote:
> Noticed by sparse:
> block/blk-softirq.c:156:12: warning: symbol 'blk_softirq_init' was not declared. Should it be static?
> block/genhd.c:583:28: warning: function 'bdget_disk' with external linkage has definition
> block/genhd.c:659:17: warning: incorrect type in argument 1 (different base types)
> block/genhd.c:659:17:    expected unsigned int [unsigned] [usertype] size
> block/genhd.c:659:17:    got restricted gfp_t
> block/genhd.c:659:29: warning: incorrect type in argument 2 (different base types)
> block/genhd.c:659:29:    expected restricted gfp_t [usertype] flags
> block/genhd.c:659:29:    got unsigned int
> block: kmalloc args reversed

Woops, that kmalloc() is nasty. Thanks a lot, applied to for-2.6.28.

-- 
Jens Axboe

Re: [PATCH] block: kmalloc args reversed, small function definition fixes

[Christoph Hellwig]

On Thu, Aug 28, 2008 at 09:26:21AM +0200, Jens Axboe wrote:
> On Wed, Aug 27 2008, Harvey Harrison wrote:
> > Noticed by sparse:
> > block/blk-softirq.c:156:12: warning: symbol 'blk_softirq_init' was not declared. Should it be static?
> > block/genhd.c:583:28: warning: function 'bdget_disk' with external linkage has definition
> > block/genhd.c:659:17: warning: incorrect type in argument 1 (different base types)
> > block/genhd.c:659:17:    expected unsigned int [unsigned] [usertype] size
> > block/genhd.c:659:17:    got restricted gfp_t
> > block/genhd.c:659:29: warning: incorrect type in argument 2 (different base types)
> > block/genhd.c:659:29:    expected restricted gfp_t [usertype] flags
> > block/genhd.c:659:29:    got unsigned int
> > block: kmalloc args reversed
> 
> Woops, that kmalloc() is nasty. Thanks a lot, applied to for-2.6.28.

Umm, the gfp bit sounds like a clear 2.6.27 candidate.

Re: [PATCH] block: kmalloc args reversed, small function definition fixes

[Jens Axboe]

On Thu, Aug 28 2008, Christoph Hellwig wrote:
> On Thu, Aug 28, 2008 at 09:26:21AM +0200, Jens Axboe wrote:
> > On Wed, Aug 27 2008, Harvey Harrison wrote:
> > > Noticed by sparse:
> > > block/blk-softirq.c:156:12: warning: symbol 'blk_softirq_init' was not declared. Should it be static?
> > > block/genhd.c:583:28: warning: function 'bdget_disk' with external linkage has definition
> > > block/genhd.c:659:17: warning: incorrect type in argument 1 (different base types)
> > > block/genhd.c:659:17:    expected unsigned int [unsigned] [usertype] size
> > > block/genhd.c:659:17:    got restricted gfp_t
> > > block/genhd.c:659:29: warning: incorrect type in argument 2 (different base types)
> > > block/genhd.c:659:29:    expected restricted gfp_t [usertype] flags
> > > block/genhd.c:659:29:    got unsigned int
> > > block: kmalloc args reversed
> > 
> > Woops, that kmalloc() is nasty. Thanks a lot, applied to for-2.6.28.
> 
> Umm, the gfp bit sounds like a clear 2.6.27 candidate.

I would agree, except the bug is introduced by a patch in the 2.6.28
series :-)

-- 
Jens Axboe

Re: [PATCH] block: kmalloc args reversed, small function definition fixes

[Christoph Hellwig]

On Thu, Aug 28, 2008 at 04:28:00PM +0200, Jens Axboe wrote:
> > > Woops, that kmalloc() is nasty. Thanks a lot, applied to for-2.6.28.
> > 
> > Umm, the gfp bit sounds like a clear 2.6.27 candidate.
> 
> I would agree, except the bug is introduced by a patch in the 2.6.28
> series :-)

Ah, okay.  Makes sense then.