summaryrefslogtreecommitdiffstats
path: root/include/linux/ext2_fs_sb.h
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-05-31 11:07:15 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-05-31 11:07:15 +0100
commite37c83c06c2690157a989df40dc99a6b61c9ea15 (patch)
tree024dfb8b2c9abeec9ca7cb0c0136c276d9aacc91 /include/linux/ext2_fs_sb.h
parentce1f7d30766f6549db6fa0b9e595e0d26a5b7d9a (diff)
parent67a3e12b05e055c0415c556a315a3d3eb637e29e (diff)
downloadtalos-op-linux-e37c83c06c2690157a989df40dc99a6b61c9ea15.tar.gz
talos-op-linux-e37c83c06c2690157a989df40dc99a6b61c9ea15.zip
Merge commit 'v2.6.35-rc1' into for-2.6.36
Diffstat (limited to 'include/linux/ext2_fs_sb.h')
-rw-r--r--include/linux/ext2_fs_sb.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/ext2_fs_sb.h b/include/linux/ext2_fs_sb.h
index 1cdb66367c98..db4d9f586bb6 100644
--- a/include/linux/ext2_fs_sb.h
+++ b/include/linux/ext2_fs_sb.h
@@ -106,6 +106,15 @@ struct ext2_sb_info {
spinlock_t s_rsv_window_lock;
struct rb_root s_rsv_window_root;
struct ext2_reserve_window_node s_rsv_window_head;
+ /*
+ * s_lock protects against concurrent modifications of s_mount_state,
+ * s_blocks_last, s_overhead_last and the content of superblock's
+ * buffer pointed to by sbi->s_es.
+ *
+ * Note: It is used in ext2_show_options() to provide a consistent view
+ * of the mount options.
+ */
+ spinlock_t s_lock;
};
static inline spinlock_t *
OpenPOWER on IntegriCloud