Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[cascardo/linux.git] / include / linux / fs.h

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 23b2a35..6e765d2 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -589,6 +589,9 @@ struct inode {
        atomic_t                i_count;
        atomic_t                i_dio_count;
        atomic_t                i_writecount;
+#ifdef CONFIG_IMA
+       atomic_t                i_readcount; /* struct files open RO */
+#endif
        const struct file_operations    *i_fop; /* former ->i_op->default_file_ops */
        struct file_lock        *i_flock;
        struct address_space    i_data;
@@ -609,9 +612,6 @@ struct inode {
        struct hlist_head       i_fsnotify_marks;
 #endif
 
-#ifdef CONFIG_IMA
-       atomic_t                i_readcount; /* struct files open RO */
-#endif
        void                    *i_private; /* fs or device private pointer */
 };