Skip to contentSkip to conversation

Stuff that needs fixing in 2.5.1-pre4

DISCUSSION Udo A. Steinberg 2 participants 5 messages Nov 30, 2001 VFAT/FAT/msdos filesystem

lore
Share & tools
lore
#0 lore raw

Hi all,

Below a few things that should probably be fixed in the current 2.5. tree.

Regards,
Udo.

drivers/ide/
pdc202xx.c: In function `config_chipset_for_dma':
pdc202xx.c:530: warning: `drive_pci' might be used uninitialized in this function

fs/fat/
inode.c: In function `fat_writepage':
inode.c:859: warning: passing arg 2 of block_write_full_page' from incompatible pointer type inode.c: In function fat_readpage':
inode.c:863: warning: passing arg 2 of block_read_full_page' from incompatible pointer type inode.c: In function fat_prepare_write':
inode.c:868: warning: passing arg 4 of cont_prepare_write' from incompatible pointer type inode.c: In function _fat_bmap':
inode.c:872: warning: passing arg 3 of `generic_block_bmap' from incompatible pointer type

/fs/minix/
In file included from itree_v1.c:47:
itree_common.c: In function `truncate':
itree_common.c:305: warning: passing arg 3 of `block_truncate_page' from incompatible pointer type

#1 lore raw
Quoted 4 lines · Udo A. Steinberg

Hi all,

Below a few things that should probably be fixed in the current 2.5. tree.

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

Signature · 1 line
Jens Axboe
#2 lore raw
In reply to Udo A. Steinberg
Quoted 3 lines · Jens Axboe

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.

fs/fat/file.c Sun Aug 12 19:56:56 2001 renamed from fs/fat/file.c Fri Nov 30 14:35:16 2001 +1 -1
diff -urN -X dontdiff linux/fs/fat/file.c linux-vanilla/fs/fat/file.c
@@ -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;
fs/minix/itree_common.c Fri Sep 7 18:45:51 2001 renamed from fs/minix/itree_common.c Fri Nov 30 14:39:37 2001 +1 -1
diff -urN -X dontdiff linux/fs/minix/itree_common.c linux-vanilla/fs/minix/itree_common.c
@@ -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;
include/linux/msdos_fs.h Fri Oct 12 22:48:42 2001 renamed from include/linux/msdos_fs.h Fri Nov 30 14:36:45 2001 +1 -1
diff -urN -X dontdiff linux/include/linux/msdos_fs.h linux-vanilla/include/linux/msdos_fs.h
@@ -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);
#3 lore raw
In reply to Udo A. Steinberg
Quoted 2 lines · Udo A. Steinberg

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

I just noticed that my patch is reversed, so please apply it with -R or alternatively try this fixed version.

-Udo.

fs/fat/file.c Fri Nov 30 14:35:16 2001 renamed from fs/fat/file.c Sun Aug 12 19:56:56 2001 +1 -1
diff -urN -X dontdiff linux-vanilla/fs/fat/file.c linux/fs/fat/file.c
@@ -48,7 +48,7 @@
 }
 
 
-int fat_get_block(struct inode *inode, long iblock, struct buffer_head *bh_result, int create)
+int fat_get_block(struct inode *inode, sector_t iblock, struct buffer_head *bh_result, int create)
 {
        struct super_block *sb = inode->i_sb;
        unsigned long phys;
fs/minix/itree_common.c Fri Nov 30 14:39:37 2001 renamed from fs/minix/itree_common.c Fri Sep 7 18:45:51 2001 +1 -1
diff -urN -X dontdiff linux-vanilla/fs/minix/itree_common.c linux/fs/minix/itree_common.c
@@ -140,7 +140,7 @@
        return -EAGAIN;
 }
 
-static inline int get_block(struct inode * inode, long block,
+static inline int get_block(struct inode * inode, sector_t block,
                        struct buffer_head *bh_result, int create)
 {
        int err = -EIO;
include/linux/msdos_fs.h Fri Nov 30 14:36:45 2001 renamed from include/linux/msdos_fs.h Fri Oct 12 22:48:42 2001 +1 -1
diff -urN -X dontdiff linux-vanilla/include/linux/msdos_fs.h linux/include/linux/msdos_fs.h
@@ -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, long iblock,
+extern int fat_get_block(struct inode *inode, sector_t 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);
#4 lore raw
In reply to Udo A. Steinberg
Quoted 6 lines · Udo A. Steinberg
Quoted 2 lines · Udo A. Steinberg

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

I just noticed that my patch is reversed, so please apply it with -R or alternatively try this fixed version.

Looks good.

Signature · 1 line
Jens Axboe