From c6ae42ca46b7cc873bef3c534c096a7041256122 Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso@mit.edu>
Date: Sat, 29 Oct 2011 08:24:18 -0400
Subject: [PATCH] --- yaml --- r: 273167 b: refs/heads/master c:
 6cdbb0effc2f511ced23e46f2117e4b31d3d4a50 h: refs/heads/master i:   273165:
 80bf6c6d556792bcb1495760c075cb7a1c01aee4   273163:
 77bc0f6073f195079c938c04378d6b4106387d1e   273159:
 61659c32f518a4616da70a7192bd9b7438cd1564   273151:
 0c2669f67742e981f13947241fe644836c0d4f74 v: v3

---
 [refs]                   |  2 +-
 trunk/include/linux/fs.h | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 8733f3c48ba2..6971c399e99b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80e675f906db54eb1ce3a9555cee5f45b5b72ab2
+refs/heads/master: 6cdbb0effc2f511ced23e46f2117e4b31d3d4a50
diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h
index 178cdb4f1d4a..fbda9a662f57 100644
--- a/trunk/include/linux/fs.h
+++ b/trunk/include/linux/fs.h
@@ -771,12 +771,13 @@ struct inode {
 	unsigned long		i_ino;
 	unsigned int		i_nlink;
 	dev_t			i_rdev;
-	loff_t			i_size;
 	struct timespec		i_atime;
 	struct timespec		i_mtime;
 	struct timespec		i_ctime;
-	unsigned int		i_blkbits;
+	spinlock_t		i_lock;	/* i_blocks, i_bytes, maybe i_size */
+	unsigned short          i_bytes;
 	blkcnt_t		i_blocks;
+	loff_t			i_size;
 
 #ifdef __NEED_I_SIZE_ORDERED
 	seqcount_t		i_size_seqcount;
@@ -784,7 +785,6 @@ struct inode {
 
 	/* Misc */
 	unsigned long		i_state;
-	spinlock_t		i_lock;	/* i_blocks, i_bytes, maybe i_size */
 	struct mutex		i_mutex;
 
 	unsigned long		dirtied_when;	/* jiffies of first dirtying */
@@ -798,9 +798,10 @@ struct inode {
 		struct rcu_head		i_rcu;
 	};
 	atomic_t		i_count;
+	unsigned int		i_blkbits;
 	u64			i_version;
-	unsigned short          i_bytes;
 	atomic_t		i_dio_count;
+	atomic_t		i_writecount;
 	const struct file_operations	*i_fop;	/* former ->i_op->default_file_ops */
 	struct file_lock	*i_flock;
 	struct address_space	i_data;
@@ -824,7 +825,6 @@ struct inode {
 #ifdef CONFIG_IMA
 	atomic_t		i_readcount; /* struct files open RO */
 #endif
-	atomic_t		i_writecount;
 	void			*i_private; /* fs or device private pointer */
 };