- 2.6.17 port work build breaks, but the patch set is relativly stable

[linux-flexiantxendom0-3.2.10.git] / fs / fat / inode.c

diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index 3d7442f..6e95f44 100644 (file)
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -102,11 +102,11 @@ static int __fat_get_blocks(struct inode *inode, sector_t iblock,
 }
 
 static int fat_get_blocks(struct inode *inode, sector_t iblock,
-                         unsigned long max_blocks,
                          struct buffer_head *bh_result, int create)
 {
        struct super_block *sb = inode->i_sb;
        int err;
+       unsigned long max_blocks = bh_result->b_size >> inode->i_blkbits;
 
        err = __fat_get_blocks(inode, iblock, &max_blocks, bh_result, create);
        if (err)
@@ -1107,7 +1107,7 @@ static int parse_options(char *options, int is_vfat, int silent, int *debug,
                        return -EINVAL;
                }
        }
-       /* UTF8 doesn't provide FAT semantics */
+       /* UTF-8 doesn't provide FAT semantics */
        if (!strcmp(opts->iocharset, "utf8")) {
                printk(KERN_ERR "FAT: utf8 is not a recommended IO charset"
                       " for FAT filesystems, filesystem will be case sensitive!\n");
@@ -1440,9 +1440,6 @@ out_fail:
 
 EXPORT_SYMBOL_GPL(fat_fill_super);
 
-int __init fat_cache_init(void);
-void fat_cache_destroy(void);
-
 static int __init init_fat_fs(void)
 {
        int err;