diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 11:21:50 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 11:21:50 +1100 |
| commit | cd73d1675614a817ff3ea3fbf32e9d8251d7828b (patch) | |
| tree | cfb12928c3022310328d2fbc16326332b72d2a70 /fs | |
| parent | 3e8e4b94d54386657b5786965967b5089f9a3402 (diff) | |
| parent | 5fe5cb271594c90f11730a24ceaca5bebe9f82af (diff) | |
Merge remote-tracking branch 'kspp/for-next/kspp'
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/char_dev.c | 2 | ||||
| -rw-r--r-- | fs/ntfs/debug.h | 6 | ||||
| -rw-r--r-- | fs/ocfs2/cluster/masklog.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/fs/char_dev.c b/fs/char_dev.c index 44a240c4bb65..3bc97002c86f 100644 --- a/fs/char_dev.c +++ b/fs/char_dev.c @@ -70,7 +70,7 @@ void chrdev_show(struct seq_file *f, off_t offset) * * Returns a -ve errno on failure. */ -static struct char_device_struct * +static __nocapture(4) struct char_device_struct * __register_chrdev_region(unsigned int major, unsigned int baseminor, int minorct, const char *name) { diff --git a/fs/ntfs/debug.h b/fs/ntfs/debug.h index 61bf091e32a8..6ac561943118 100644 --- a/fs/ntfs/debug.h +++ b/fs/ntfs/debug.h @@ -30,7 +30,7 @@ extern int debug_msgs; -extern __printf(4, 5) +extern __printf(4, 5) __nocapture(3) void __ntfs_debug(const char *file, int line, const char *function, const char *format, ...); /** @@ -58,12 +58,12 @@ do { \ #endif /* !DEBUG */ -extern __printf(3, 4) +extern __printf(3, 4) __nocapture(1) void __ntfs_warning(const char *function, const struct super_block *sb, const char *fmt, ...); #define ntfs_warning(sb, f, a...) __ntfs_warning(__func__, sb, f, ##a) -extern __printf(3, 4) +extern __printf(3, 4) __nocapture(1) void __ntfs_error(const char *function, const struct super_block *sb, const char *fmt, ...); #define ntfs_error(sb, f, a...) __ntfs_error(__func__, sb, f, ##a) diff --git a/fs/ocfs2/cluster/masklog.h b/fs/ocfs2/cluster/masklog.h index 308ea0eb35fd..3c16da69605d 100644 --- a/fs/ocfs2/cluster/masklog.h +++ b/fs/ocfs2/cluster/masklog.h @@ -162,7 +162,7 @@ extern struct mlog_bits mlog_and_bits, mlog_not_bits; #endif -__printf(4, 5) +__printf(4, 5) __nocapture(2) void __mlog_printk(const u64 *m, const char *func, int line, const char *fmt, ...); |