diff options
| author | Joel Becker <joel.becker@oracle.com> | 2008-06-13 07:39:18 +0200 |
|---|---|---|
| committer | Mark Fasheh <mfasheh@suse.com> | 2008-07-14 22:57:15 +0200 |
| commit | fe9f387740ac7cb3b7c2fffa76807e997e6c6292 (patch) | |
| tree | 40c052c3ace5e07980c01aa5c4ea5d2d0df9638b /fs | |
| parent | ocfs2: Fix CONFIG_OCFS2_DEBUG_FS #ifdefs (diff) | |
| download | linux-fe9f387740ac7cb3b7c2fffa76807e997e6c6292.tar.xz linux-fe9f387740ac7cb3b7c2fffa76807e997e6c6292.zip | |
ocfs2: Don't snprintf() without a format.
Some system files are per-slot. Their names include the slot number.
ocfs2_sprintf_system_inode_name() uses the system inode definitions to
fill in the slot number with snprintf().
For global system files, there is no node number, and the name was
printed as a format with no arguments. -Wformat-nonliteral and
-Wformat-security don't like this. Instead, use a static "%s" format
and the name as the argument.
Signed-off-by: Joel Becker <joel.becker@oracle.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ocfs2/ocfs2_fs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/ocfs2_fs.h b/fs/ocfs2/ocfs2_fs.h index 52c426665154..3f1945177629 100644 --- a/fs/ocfs2/ocfs2_fs.h +++ b/fs/ocfs2/ocfs2_fs.h @@ -901,7 +901,7 @@ static inline int ocfs2_sprintf_system_inode_name(char *buf, int len, * list has a copy per slot. */ if (type <= OCFS2_LAST_GLOBAL_SYSTEM_INODE) - chars = snprintf(buf, len, + chars = snprintf(buf, len, "%s", ocfs2_system_inodes[type].si_name); else chars = snprintf(buf, len, |