[folded-merged] fat-use-fat_fs_error-instead-of-bug_on-in-__fat_get_block-fix.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: fat-use-fat_fs_error-instead-of-bug_on-in-__fat_get_block-fix
has been removed from the -mm tree.  Its filename was
     fat-use-fat_fs_error-instead-of-bug_on-in-__fat_get_block-fix.patch

This patch was dropped because it was folded into fat-use-fat_fs_error-instead-of-bug_on-in-__fat_get_block.patch

------------------------------------------------------
From: OGAWA Hirofumi <hirofumi@xxxxxxxxxxxxxxxxxx>
Subject: fat-use-fat_fs_error-instead-of-bug_on-in-__fat_get_block-fix

fix printk warning

Link: http://lkml.kernel.org/r/87po12aq5p.fsf@xxxxxxxxxxxxxxxxxx
Signed-off-by: OGAWA Hirofumi <hirofumi@xxxxxxxxxxxxxxxxxx>
Cc: Anatoly Trosinenko <anatoly.trosinenko@xxxxxxxxx>
Tested-by: Anatoly Trosinenko <anatoly.trosinenko@xxxxxxxxx>
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 fs/fat/inode.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff -puN fs/fat/inode.c~fat-use-fat_fs_error-instead-of-bug_on-in-__fat_get_block-fix fs/fat/inode.c
--- a/fs/fat/inode.c~fat-use-fat_fs_error-instead-of-bug_on-in-__fat_get_block-fix
+++ a/fs/fat/inode.c
@@ -160,8 +160,9 @@ static inline int __fat_get_block(struct
 		return err;
 	if (!phys) {
 		fat_fs_error(sb,
-			     "invalid FAT chain (i_pos %lld, last_block %ld)",
-			     MSDOS_I(inode)->i_pos, last_block);
+			     "invalid FAT chain (i_pos %lld, last_block %llu)",
+			     MSDOS_I(inode)->i_pos,
+			     (unsigned long long)last_block);
 		return -EIO;
 	}
 
_

Patches currently in -mm which might be from hirofumi@xxxxxxxxxxxxxxxxxx are

fat-use-fat_fs_error-instead-of-bug_on-in-__fat_get_block.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux