The patch titled
Subject: adfs: add __printf verification, fix format/argument mismatches
has been removed from the -mm tree. Its filename was
adfs-add-__printf-verification-fix-format-argument-mismatches.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Joe Perches <joe@xxxxxxxxxxx>
Subject: adfs: add __printf verification, fix format/argument mismatches
Might as well do the right thing.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/adfs/adfs.h | 1 +
fs/adfs/dir.c | 2 +-
fs/adfs/dir_fplus.c | 5 ++---
3 files changed, 4 insertions(+), 4 deletions(-)
diff -puN fs/adfs/adfs.h~adfs-add-__printf-verification-fix-format-argument-mismatches fs/adfs/adfs.h
--- a/fs/adfs/adfs.h~adfs-add-__printf-verification-fix-format-argument-mismatches
+++ a/fs/adfs/adfs.h
@@ -153,6 +153,7 @@ extern int adfs_map_lookup(struct super_
extern unsigned int adfs_map_free(struct super_block *sb);
/* Misc */
+__printf(3, 4)
void __adfs_error(struct super_block *sb, const char *function,
const char *fmt, ...);
#define adfs_error(sb, fmt...) __adfs_error(sb, __func__, fmt)
diff -puN fs/adfs/dir.c~adfs-add-__printf-verification-fix-format-argument-mismatches fs/adfs/dir.c
--- a/fs/adfs/dir.c~adfs-add-__printf-verification-fix-format-argument-mismatches
+++ a/fs/adfs/dir.c
@@ -138,7 +138,7 @@ adfs_dir_lookup_byname(struct inode *ino
goto out;
if (ADFS_I(inode)->parent_id != dir.parent_id) {
- adfs_error(sb, "parent directory changed under me! (%lx but got %lx)\n",
+ adfs_error(sb, "parent directory changed under me! (%lx but got %x)\n",
ADFS_I(inode)->parent_id, dir.parent_id);
ret = -EIO;
goto free_out;
diff -puN fs/adfs/dir_fplus.c~adfs-add-__printf-verification-fix-format-argument-mismatches fs/adfs/dir_fplus.c
--- a/fs/adfs/dir_fplus.c~adfs-add-__printf-verification-fix-format-argument-mismatches
+++ a/fs/adfs/dir_fplus.c
@@ -79,9 +79,8 @@ adfs_fplus_read(struct super_block *sb,
dir->bh_fplus[blk] = sb_bread(sb, block);
if (!dir->bh_fplus[blk]) {
- adfs_error(sb, "dir object %X failed read for"
- " offset %d, mapped block %X",
- id, blk, block);
+ adfs_error(sb, "dir object %x failed read for offset %d, mapped block %lX",
+ id, blk, block);
goto out;
}
_
Patches currently in -mm which might be from joe@xxxxxxxxxxx are
origin.patch
mm-utilc-add-kstrimdup.patch
fs-isofs-logging-clean-up.patch
linux-next.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
