The patch titled
inode-diet: Fix size of i_blkbits, i_version, and i_dnotify_mask
has been added to the -mm tree. Its filename is
inode-diet-fix-size-of-i_blkbits-i_version-and-i_dnotify_mask.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: inode-diet: Fix size of i_blkbits, i_version, and i_dnotify_mask
From: "Theodore Ts'o" <tytso@xxxxxxx>
i_blkbits stores the log n of the blocksize; there is no reason for it to take
more than 16 bits, so change it to be a short and put it next to i_mode.
i_version and i_dnotify_mask need to be 32 bits, but there is no reason for
them to be 64-bit values on 64-bit architectures, so make them be unsigned
int's instead of unsigned long's.
Signed-off-by: "Theodore Ts'o" <tytso@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/linux/fs.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff -puN include/linux/fs.h~inode-diet-fix-size-of-i_blkbits-i_version-and-i_dnotify_mask include/linux/fs.h
--- a/include/linux/fs.h~inode-diet-fix-size-of-i_blkbits-i_version-and-i_dnotify_mask
+++ a/include/linux/fs.h
@@ -498,6 +498,7 @@ struct inode {
unsigned long i_ino;
atomic_t i_count;
umode_t i_mode;
+ unsigned short i_blkbits;
unsigned int i_nlink;
uid_t i_uid;
gid_t i_gid;
@@ -505,8 +506,7 @@ struct inode {
struct timespec i_atime;
struct timespec i_mtime;
struct timespec i_ctime;
- unsigned int i_blkbits;
- unsigned long i_version;
+ unsigned int i_version;
spinlock_t i_lock; /* i_blocks, i_bytes, maybe i_size */
struct mutex i_mutex;
struct rw_semaphore i_alloc_sem;
@@ -538,7 +538,7 @@ struct inode {
__u32 i_generation;
#ifdef CONFIG_DNOTIFY
- unsigned long i_dnotify_mask; /* Directory notify events */
+ unsigned int i_dnotify_mask; /* Directory notify events */
struct dnotify_struct *i_dnotify; /* for directory notifications */
#endif
_
Patches currently in -mm which might be from tytso@xxxxxxx are
origin.patch
uml-build-fix.patch
inode_diet-replace-inodeugeneric_ip-with-inodei_private.patch
inode-diet-move-i_pipe-into-a-union.patch
inode-diet-move-i_bdev-into-a-union.patch
inode-diet-move-i_cdev-into-a-union.patch
inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default.patch
inode-diet-move-i_cindex-from-struct-inode-to-struct-file.patch
inode-diet-use-a-union-for-i_blocks-and-i_size-i_rdev-and-i_devices.patch
inode-diet-fix-size-of-i_blkbits-i_version-and-i_dnotify_mask.patch
inode-diet-move-i_pipe-into-a-union-ecryptfs.patch
inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default-ecryptfs.patch
inode_diet-replace-inodeugeneric_ip-with-inodei_private-reiser4.patch
inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default-reiser4.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
