Merge tag 'rpmsg-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson...

[linux.git] / fs / f2fs / sysfs.c

diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
index f9fcca695db9f1cbc445a0467891684e3d4bf2da..b558b64a4c9ca33eee88896bc53ab4f07036a22f 100644 (file)
--- a/fs/f2fs/sysfs.c
+++ b/fs/f2fs/sysfs.c
@@ -145,6 +145,9 @@ static ssize_t features_show(struct f2fs_attr *a,
        if (f2fs_sb_has_lost_found(sbi))
                len += snprintf(buf + len, PAGE_SIZE - len, "%s%s",
                                len ? ", " : "", "lost_found");
+       if (f2fs_sb_has_verity(sbi))
+               len += snprintf(buf + len, PAGE_SIZE - len, "%s%s",
+                               len ? ", " : "", "verity");
        if (f2fs_sb_has_sb_chksum(sbi))
                len += snprintf(buf + len, PAGE_SIZE - len, "%s%s",
                                len ? ", " : "", "sb_checksum");
@@ -381,6 +384,7 @@ enum feat_id {
        FEAT_QUOTA_INO,
        FEAT_INODE_CRTIME,
        FEAT_LOST_FOUND,
+       FEAT_VERITY,
        FEAT_SB_CHECKSUM,
        FEAT_CASEFOLD,
 };
@@ -399,6 +403,7 @@ static ssize_t f2fs_feature_show(struct f2fs_attr *a,
        case FEAT_QUOTA_INO:
        case FEAT_INODE_CRTIME:
        case FEAT_LOST_FOUND:
+       case FEAT_VERITY:
        case FEAT_SB_CHECKSUM:
        case FEAT_CASEFOLD:
                return snprintf(buf, PAGE_SIZE, "supported\n");
@@ -490,6 +495,9 @@ F2FS_FEATURE_RO_ATTR(flexible_inline_xattr, FEAT_FLEXIBLE_INLINE_XATTR);
 F2FS_FEATURE_RO_ATTR(quota_ino, FEAT_QUOTA_INO);
 F2FS_FEATURE_RO_ATTR(inode_crtime, FEAT_INODE_CRTIME);
 F2FS_FEATURE_RO_ATTR(lost_found, FEAT_LOST_FOUND);
+#ifdef CONFIG_FS_VERITY
+F2FS_FEATURE_RO_ATTR(verity, FEAT_VERITY);
+#endif
 F2FS_FEATURE_RO_ATTR(sb_checksum, FEAT_SB_CHECKSUM);
 F2FS_FEATURE_RO_ATTR(casefold, FEAT_CASEFOLD);
 
@@ -556,6 +564,9 @@ static struct attribute *f2fs_feat_attrs[] = {
        ATTR_LIST(quota_ino),
        ATTR_LIST(inode_crtime),
        ATTR_LIST(lost_found),
+#ifdef CONFIG_FS_VERITY
+       ATTR_LIST(verity),
+#endif
        ATTR_LIST(sb_checksum),
        ATTR_LIST(casefold),
        NULL,