The patch titled
Subject: nilfs: avoid warning about unused variables
has been removed from the -mm tree. Its filename was
nilfs2-replace-nilfs_warning-with-nilfs_msg-fix.patch
This patch was dropped because it was folded into nilfs2-replace-nilfs_warning-with-nilfs_msg.patch
------------------------------------------------------
From: Arnd Bergmann <arnd@xxxxxxxx>
Subject: nilfs: avoid warning about unused variables
The newly added nilfs_msg() infrastructure caused a warning in
nilfs_clear_dirty_page() when it is disabled:
fs/nilfs2/page.c: In function 'nilfs_clear_dirty_page':
fs/nilfs2/page.c:402:22: error: unused variable 'sb' [-Werror=unused-variable]
struct super_block *sb = inode->i_sb;
We can avoid the warning by adding a cast to void for the first
argument of the macro.
Fixes: aede53d223f0 ("nilfs2: replace nilfs_warning() with nilfs_msg()")
Link: http://lkml.kernel.org/r/20160615201945.3348205-1-arnd@xxxxxxxx
Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
Cc: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/nilfs2/nilfs.h | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff -puN fs/nilfs2/nilfs.h~nilfs2-replace-nilfs_warning-with-nilfs_msg-fix fs/nilfs2/nilfs.h
--- a/fs/nilfs2/nilfs.h~nilfs2-replace-nilfs_warning-with-nilfs_msg-fix
+++ a/fs/nilfs2/nilfs.h
@@ -317,7 +317,10 @@ void __nilfs_error(struct super_block *s
#else
#define nilfs_msg(sb, level, fmt, ...) \
- no_printk(fmt, ##__VA_ARGS__)
+ do { \
+ no_printk(fmt, ##__VA_ARGS__); \
+ (void)(sb); \
+ } while (0)
#define nilfs_error(sb, fmt, ...) \
do { \
no_printk(fmt, ##__VA_ARGS__); \
_
Patches currently in -mm which might be from arnd@xxxxxxxx are
procfs-avoid-32-bit-time_t-in-proc-stat.patch
crc32-use-ktime_get_ns-for-measurement.patch
nilfs2-replace-nilfs_warning-with-nilfs_msg.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
