[PATCH] FAT: small cleanup

diff --git a/fs/fat/file.c b/fs/fat/file.c
index 9c5691d466a1bd9fb33e60fdff1ad4807a85d02a..00cb5d720744f51cf7f843dfd4aa474dbca8f46a 100644 (file)
--- a/fs/fat/file.c
+++ b/fs/fat/file.c
@@ -50,7 +50,7 @@ int fat_get_block(struct inode *inode, sector_t iblock,
                BUG();
                return -EIO;
        }
-       if (!((unsigned long)iblock % MSDOS_SB(sb)->sec_per_clus)) {
+       if (!((unsigned long)iblock & (MSDOS_SB(sb)->sec_per_clus - 1))) {
                int error;
 
                error = fat_add_cluster(inode);

diff --git a/fs/fat/misc.c b/fs/fat/misc.c
index ab744357b815f45171b3684d9121c465ba1f6e2f..413a41410767e3321295a102b0e2573f0cb3e949 100644 (file)
--- a/fs/fat/misc.c
+++ b/fs/fat/misc.c
@@ -205,7 +205,7 @@ struct buffer_head *fat_extend_dir(struct inode *inode)
        if (inode->i_size & (sb->s_blocksize - 1)) {
                fat_fs_panic(sb, "Odd directory size");
                inode->i_size = (inode->i_size + sb->s_blocksize)
-                       & ~(sb->s_blocksize - 1);
+                       & ~((loff_t)sb->s_blocksize - 1);
        }
        inode->i_size += MSDOS_SB(sb)->cluster_size;
        MSDOS_I(inode)->mmu_private += MSDOS_SB(sb)->cluster_size;