Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...

[mv-sheeva.git] / include / linux / fs.h

diff --git a/include/linux/fs.h b/include/linux/fs.h
index ae527beb74e4c4d14373024971ab17b77738c8a1..7d6f18fddfdb9241b6734eb918828dbec253a8ba 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1384,7 +1384,7 @@ struct super_block {
         * Saved mount options for lazy filesystems using
         * generic_show_options()
         */
-       char *s_options;
+       char __rcu *s_options;
 };
 
 extern struct timespec current_fs_time(struct super_block *sb);