leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[LogFS] Check feature flags

Browse Source
This commit is contained in:
Joern Engel
2010-03-05 16:07:04 +01:00
parent c6d3830140
commit 6a08ab846c
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/logfs/logfs_abi.h
View File

@@ -193,6 +193,10 @@ struct logfs_segment_header {
SIZE_CHECK(logfs_segment_header, LOGFS_SEGMENT_HEADERSIZE); 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 * struct logfs_disk_super - on-medium superblock
* *

10
fs/logfs/super.c
View File

@@ -440,7 +440,7 @@ static int __logfs_read_sb(struct super_block *sb)
return 0; 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); struct logfs_super *super = logfs_super(sb);
int ret; int ret;
@@ -460,6 +460,12 @@ static int logfs_read_sb(struct super_block *sb)
if (ret) if (ret)
return 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_dirop_mutex);
mutex_init(&super->s_object_alias_mutex); mutex_init(&super->s_object_alias_mutex);
INIT_LIST_HEAD(&super->s_freeing_list); 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_op = &logfs_super_operations;
sb->s_flags = flags | MS_NOATIME; sb->s_flags = flags | MS_NOATIME;
err = logfs_read_sb(sb); err = logfs_read_sb(sb, sb->s_flags & MS_RDONLY);
if (err) if (err)
goto err1; goto err1;