The patch titled
inode_diet: Replace inode.u.generic_ip with inode.i_private
has been added to the -mm tree. Its filename is
inode-diet-move-i_pipe-into-a-union-ecryptfs.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: Replace inode.u.generic_ip with inode.i_private
From: "Theodore Ts'o" <tytso@xxxxxxx>
The filesystem or device-specific pointer in the inode is inside a union,
which is pretty pointless given that all 30+ users of this field have been
using the void pointer. Get rid of the union and rename it to i_private, with
a comment to explain who is allowed to use the void pointer. This is just a
cleanup, but it allows us to reuse the union 'u' for something something where
the union will actually be used.
Signed-off-by: "Theodore Ts'o" <tytso@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/ecryptfs/ecryptfs_kernel.h | 8 ++++----
fs/ecryptfs/super.c | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff -puN fs/ecryptfs/ecryptfs_kernel.h~inode-diet-move-i_pipe-into-a-union-ecryptfs fs/ecryptfs/ecryptfs_kernel.h
--- a/fs/ecryptfs/ecryptfs_kernel.h~inode-diet-move-i_pipe-into-a-union-ecryptfs
+++ a/fs/ecryptfs/ecryptfs_kernel.h
@@ -288,25 +288,25 @@ ecryptfs_set_file_lower(struct file *fil
static inline struct ecryptfs_inode_info *
ecryptfs_inode_to_private(struct inode *inode)
{
- return (struct ecryptfs_inode_info *)inode->u.generic_ip;
+ return (struct ecryptfs_inode_info *)inode->i_private;
}
static inline void
ecryptfs_set_inode_private(struct inode *inode,
struct ecryptfs_inode_info *inode_info)
{
- inode->u.generic_ip = inode_info;
+ inode->i_private = inode_info;
}
static inline struct inode *ecryptfs_inode_to_lower(struct inode *inode)
{
- return ((struct ecryptfs_inode_info *)inode->u.generic_ip)->wii_inode;
+ return ((struct ecryptfs_inode_info *)inode->i_private)->wii_inode;
}
static inline void
ecryptfs_set_inode_lower(struct inode *inode, struct inode *lower_inode)
{
- ((struct ecryptfs_inode_info *)inode->u.generic_ip)->wii_inode =
+ ((struct ecryptfs_inode_info *)inode->i_private)->wii_inode =
lower_inode;
}
diff -puN fs/ecryptfs/super.c~inode-diet-move-i_pipe-into-a-union-ecryptfs fs/ecryptfs/super.c
--- a/fs/ecryptfs/super.c~inode-diet-move-i_pipe-into-a-union-ecryptfs
+++ a/fs/ecryptfs/super.c
@@ -86,7 +86,7 @@ static void ecryptfs_destroy_inode(struc
static void ecryptfs_read_inode(struct inode *inode)
{
/* This is where we setup the self-reference in the vfs_inode's
- * u.generic_ip. That way we don't have to walk the list again. */
+ * i_private. That way we don't have to walk the list again. */
ecryptfs_set_inode_private(inode,
list_entry(inode, struct ecryptfs_inode_info,
vfs_inode));
_
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
