From 24be86d34bf18a8b64d67142451193f4281dfb84 Mon Sep 17 00:00:00 2001
From: Joern Engel <joern@logfs.org>
Date: Fri, 5 Mar 2010 16:07:04 +0100
Subject: [PATCH] --- yaml --- r: 186444 b: refs/heads/master c:
 6a08ab846cefc82a328cbf9abd96c2e58a6c3664 h: refs/heads/master v: v3

---
 [refs]                     |  2 +-
 trunk/fs/logfs/logfs_abi.h |  4 ++++
 trunk/fs/logfs/super.c     | 10 ++++++++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 160d73654844..6444ca2de0ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6d3830140f1d56b07d8ab56a6e14ca3c492a39a
+refs/heads/master: 6a08ab846cefc82a328cbf9abd96c2e58a6c3664
diff --git a/trunk/fs/logfs/logfs_abi.h b/trunk/fs/logfs/logfs_abi.h
index 5d3782ddecc8..8d4dd3de551e 100644
--- a/trunk/fs/logfs/logfs_abi.h
+++ b/trunk/fs/logfs/logfs_abi.h
@@ -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
  *
diff --git a/trunk/fs/logfs/super.c b/trunk/fs/logfs/super.c
index 1d081b7ede5a..c66beab78dee 100644
--- a/trunk/fs/logfs/super.c
+++ b/trunk/fs/logfs/super.c
@@ -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;