Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a08ab84 authored by Joern Engel's avatar Joern Engel
Browse files

[LogFS] Check feature flags

parent c6d38301

fs/logfs/logfs_abi.h

+4 −0
Original line number Diff line number Diff line
@@ -193,6 +193,10 @@ struct logfs_segment_header { 


SIZE_CHECK(logfs_segment_header, LOGFS_SEGMENT_HEADERSIZE);



#define LOGFS_FEATURES_INCOMPAT		(0ull)

#define LOGFS_FEATURES_RO_COMPAT	(0ull)

#define LOGFS_FEATURES_COMPAT		(0ull)



/**

 * struct logfs_disk_super - on-medium superblock

 *

fs/logfs/super.c

+8 −2
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ static int __logfs_read_sb(struct super_block *sb) 
	return 0;

}



static int logfs_read_sb(struct super_block *sb)

static int logfs_read_sb(struct super_block *sb, int read_only)

{

	struct logfs_super *super = logfs_super(sb);

	int ret;
@@ -460,6 +460,12 @@ static int logfs_read_sb(struct super_block *sb) 
	if (ret)

		return ret;



	if (super->s_feature_incompat & ~LOGFS_FEATURES_INCOMPAT)

		return -EIO;

	if ((super->s_feature_ro_compat & ~LOGFS_FEATURES_RO_COMPAT) &&

			!read_only)

		return -EIO;



	mutex_init(&super->s_dirop_mutex);

	mutex_init(&super->s_object_alias_mutex);

	INIT_LIST_HEAD(&super->s_freeing_list);
@@ -555,7 +561,7 @@ int logfs_get_sb_device(struct file_system_type *type, int flags, 
	sb->s_op	= &logfs_super_operations;

	sb->s_flags	= flags | MS_NOATIME;



	err = logfs_read_sb(sb);

	err = logfs_read_sb(sb, sb->s_flags & MS_RDONLY);

	if (err)

		goto err1;