From 14651320065dbcc86b10116d58842e4aff0193a0 Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@mandriva.com>
Date: Wed, 6 Dec 2006 20:39:53 -0800
Subject: [PATCH] --- yaml --- r: 42925 b: refs/heads/master c:
 12d40e43d251de4fa1f982567fc8b4ee5e858367 h: refs/heads/master i:   42923:
 fef15fe9e11cd32cb7ab76cc46b405a09ec67620 v: v3

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

diff --git a/[refs] b/[refs]
index 96c9ec696167..ca97a61ac731 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 652d3a3ed7610bb09530127ca297b538fe7d245a
+refs/heads/master: 12d40e43d251de4fa1f982567fc8b4ee5e858367
diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h
index 3a1927e516d0..70b99fbb560b 100644
--- a/trunk/include/linux/fs.h
+++ b/trunk/include/linux/fs.h
@@ -543,7 +543,6 @@ struct inode {
 	struct list_head	i_dentry;
 	unsigned long		i_ino;
 	atomic_t		i_count;
-	umode_t			i_mode;
 	unsigned int		i_nlink;
 	uid_t			i_uid;
 	gid_t			i_gid;
@@ -559,6 +558,7 @@ struct inode {
 	unsigned int		i_blkbits;
 	blkcnt_t		i_blocks;
 	unsigned short          i_bytes;
+	umode_t			i_mode;
 	spinlock_t		i_lock;	/* i_blocks, i_bytes, maybe i_size */
 	struct mutex		i_mutex;
 	struct rw_semaphore	i_alloc_sem;