nilfs2: Mark on-disk strings as nonstring

In preparation for memtostr*() checking that its source is marked as
nonstring, annotate the device strings accordingly using the new UAPI
alias for the "nonstring" attribute.

Signed-off-by: Kees Cook <kees@kernel.org>

diff --git a/include/uapi/linux/nilfs2_ondisk.h b/include/uapi/linux/nilfs2_ondisk.h
index c23f91ae5fe8b17c6176c91027b63840dd1c2a0b..3196cc44a002813986bfd1dcce9b91416d1122c9 100644 (file)
--- a/include/uapi/linux/nilfs2_ondisk.h
+++ b/include/uapi/linux/nilfs2_ondisk.h
@@ -188,7 +188,8 @@ struct nilfs_super_block {
        __le16  s_segment_usage_size;   /* Size of a segment usage */
 
 /*98*/ __u8    s_uuid[16];             /* 128-bit uuid for volume */
-/*A8*/ char    s_volume_name[80];      /* volume name */
+/*A8*/ char    s_volume_name[80]       /* volume name */
+                       __kernel_nonstring;
 
 /*F8*/ __le32  s_c_interval;           /* Commit interval of segment */
        __le32  s_c_block_max;          /*