[PATCH] Re: Stuff that needs fixing in 2.5.1-pre4

[Udo A. Steinberg]

Jens Axboe wrote:
> 
> Make the get_block long argument for block a sector_t. Once you have
> that warning free, send on the fix.

Thanks for the tip. Here's a patch against 2.5.1-pre4 that fixes it.

Regards,
Udo.

diff -urN -X dontdiff linux/fs/fat/file.c linux-vanilla/fs/fat/file.c
--- linux/fs/fat/file.c Fri Nov 30 14:35:16 2001
+++ linux-vanilla/fs/fat/file.c Sun Aug 12 19:56:56 2001
@@ -48,7 +48,7 @@
 }

-int fat_get_block(struct inode *inode, sector_t iblock, struct buffer_head *bh_result, int create)
+int fat_get_block(struct inode *inode, long iblock, struct buffer_head *bh_result, int create)
 {
        struct super_block *sb = inode->i_sb;
        unsigned long phys;
diff -urN -X dontdiff linux/fs/minix/itree_common.c linux-vanilla/fs/minix/itree_common.c
--- linux/fs/minix/itree_common.c       Fri Nov 30 14:39:37 2001
+++ linux-vanilla/fs/minix/itree_common.c       Fri Sep  7 18:45:51 2001
@@ -140,7 +140,7 @@
        return -EAGAIN;
 }

-static inline int get_block(struct inode * inode, sector_t block,
+static inline int get_block(struct inode * inode, long block,
                        struct buffer_head *bh_result, int create)
 {
        int err = -EIO;
diff -urN -X dontdiff linux/include/linux/msdos_fs.h linux-vanilla/include/linux/msdos_fs.h
--- linux/include/linux/msdos_fs.h      Fri Nov 30 14:36:45 2001
+++ linux-vanilla/include/linux/msdos_fs.h      Fri Oct 12 22:48:42 2001
@@ -273,7 +273,7 @@
 extern struct inode_operations fat_file_inode_operations;
 extern ssize_t fat_file_read(struct file *filp, char *buf, size_t count,
                             loff_t *ppos);
-extern int fat_get_block(struct inode *inode, sector_t iblock,
+extern int fat_get_block(struct inode *inode, long iblock,
                         struct buffer_head *bh_result, int create);
 extern ssize_t fat_file_write(struct file *filp, const char *buf, size_t count,
                              loff_t *ppos);