Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3991d3bd authored by Tomasz Kvarsin's avatar Tomasz Kvarsin Committed by Linus Torvalds
Browse files

[PATCH] warning fix: unsigned->signed 



While compiling my code with -Wconversion using gcc-trunk, I always get a
bunch of warrning from headers, here is fix for them:

__getblk is alawys called with unsigned argument,
but it takes signed, the same story with __bread,__breadahead and so on.

Signed-off-by: Tomasz Kvarsin
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent bc1fc6d8

fs/buffer.c

+6 −6
Original line number Diff line number Diff line
@@ -1283,11 +1283,11 @@ static void bh_lru_install(struct buffer_head *bh) 
 * Look up the bh in this cpu's LRU.  If it's there, move it to the head.

 */

static struct buffer_head *

lookup_bh_lru(struct block_device *bdev, sector_t block, int size)

lookup_bh_lru(struct block_device *bdev, sector_t block, unsigned size)

{

	struct buffer_head *ret = NULL;

	struct bh_lru *lru;

	int i;

	unsigned int i;



	check_irqs_on();

	bh_lru_lock();
@@ -1319,7 +1319,7 @@ lookup_bh_lru(struct block_device *bdev, sector_t block, int size) 
 * NULL

 */

struct buffer_head *

__find_get_block(struct block_device *bdev, sector_t block, int size)

__find_get_block(struct block_device *bdev, sector_t block, unsigned size)

{

	struct buffer_head *bh = lookup_bh_lru(bdev, block, size);
@@ -1347,7 +1347,7 @@ EXPORT_SYMBOL(__find_get_block); 
 * attempt is failing.  FIXME, perhaps?

 */

struct buffer_head *

__getblk(struct block_device *bdev, sector_t block, int size)

__getblk(struct block_device *bdev, sector_t block, unsigned size)

{

	struct buffer_head *bh = __find_get_block(bdev, block, size);
@@ -1361,7 +1361,7 @@ EXPORT_SYMBOL(__getblk); 
/*

 * Do async read-ahead on a buffer..

 */

void __breadahead(struct block_device *bdev, sector_t block, int size)

void __breadahead(struct block_device *bdev, sector_t block, unsigned size)

{

	struct buffer_head *bh = __getblk(bdev, block, size);

	if (likely(bh)) {
@@ -1381,7 +1381,7 @@ EXPORT_SYMBOL(__breadahead); 
 *  It returns NULL if the block was unreadable.

 */

struct buffer_head *

__bread(struct block_device *bdev, sector_t block, int size)

__bread(struct block_device *bdev, sector_t block, unsigned size)

{

	struct buffer_head *bh = __getblk(bdev, block, size);

include/linux/buffer_head.h

+6 −4
Original line number Diff line number Diff line
@@ -174,12 +174,14 @@ struct super_block *freeze_bdev(struct block_device *); 
void thaw_bdev(struct block_device *, struct super_block *);

int fsync_super(struct super_block *);

int fsync_no_super(struct block_device *);

struct buffer_head *__find_get_block(struct block_device *, sector_t, int);

struct buffer_head * __getblk(struct block_device *, sector_t, int);

struct buffer_head *__find_get_block(struct block_device *bdev, sector_t block,

			unsigned size);

struct buffer_head *__getblk(struct block_device *bdev, sector_t block,

			unsigned size);

void __brelse(struct buffer_head *);

void __bforget(struct buffer_head *);

void __breadahead(struct block_device *, sector_t block, int size);

struct buffer_head *__bread(struct block_device *, sector_t block, int size);

void __breadahead(struct block_device *, sector_t block, unsigned int size);

struct buffer_head *__bread(struct block_device *, sector_t block, unsigned size);

struct buffer_head *alloc_buffer_head(gfp_t gfp_flags);

void free_buffer_head(struct buffer_head * bh);

void FASTCALL(unlock_buffer(struct buffer_head *bh));