summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Becker <joel.becker@oracle.com>2008-06-12 22:39:18 -0700
committerMark Fasheh <mfasheh@suse.com>2008-07-14 13:57:15 -0700
commitfe9f387740ac7cb3b7c2fffa76807e997e6c6292 (patch)
tree40c052c3ace5e07980c01aa5c4ea5d2d0df9638b
parente407e39783a7206d20b3e9961aedf272de966e31 (diff)
downloadop-kernel-dev-fe9f387740ac7cb3b7c2fffa76807e997e6c6292.zip
op-kernel-dev-fe9f387740ac7cb3b7c2fffa76807e997e6c6292.tar.gz
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>
-rw-r--r--fs/ocfs2/ocfs2_fs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/ocfs2_fs.h b/fs/ocfs2/ocfs2_fs.h
index 52c4266..3f19451 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,
OpenPOWER on IntegriCloud