summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2009-06-10 19:05:56 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2009-06-10 19:05:56 +1000
commitc70be3aa0f86e516f0d85d2c13c90000451c224a (patch)
tree38b54a781a9f9eda2c62a38a301fcb040284e9d0
parenteaaf8794e60599c27063160efd1935a895eae1be (diff)
Revert "fs: i_flags and i_state in struct inode only need to be unsigned short"
This reverts commit d4fdcb2068eef29c03d6027aa219fa60171c6b87.
-rw-r--r--include/linux/fs.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h
index d9c126fe0a92..7045f8c87710 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -764,10 +764,10 @@ struct inode {
struct mutex inotify_mutex; /* protects the watches list */
#endif
+ unsigned long i_state;
unsigned long dirtied_when; /* jiffies of first dirtying */
- unsigned short i_state;
- unsigned short i_flags;
+ unsigned int i_flags;
atomic_t i_writecount;
#ifdef CONFIG_SECURITY