The patch titled
inode-diet: Move i_bdev into a union
has been removed from the -mm tree. Its filename is
inode-diet-move-i_bdev-into-a-union.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: inode-diet: Move i_bdev into a union
From: "Theodore Ts'o" <tytso@xxxxxxx>
Move the i_bdev pointer in struct inode into a union.
Signed-off-by: "Theodore Ts'o" <tytso@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/inode.c | 2 +-
include/linux/fs.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff -puN fs/inode.c~inode-diet-move-i_bdev-into-a-union fs/inode.c
--- a/fs/inode.c~inode-diet-move-i_bdev-into-a-union
+++ a/fs/inode.c
@@ -254,7 +254,7 @@ void clear_inode(struct inode *inode)
DQUOT_DROP(inode);
if (inode->i_sb && inode->i_sb->s_op->clear_inode)
inode->i_sb->s_op->clear_inode(inode);
- if (inode->i_bdev)
+ if (S_ISBLK(inode->i_mode) && inode->i_bdev)
bd_forget(inode);
if (inode->i_cdev)
cd_forget(inode);
diff -puN include/linux/fs.h~inode-diet-move-i_bdev-into-a-union include/linux/fs.h
--- a/include/linux/fs.h~inode-diet-move-i_bdev-into-a-union
+++ a/include/linux/fs.h
@@ -531,8 +531,8 @@ struct inode {
struct list_head i_devices;
union {
struct pipe_inode_info *i_pipe;
+ struct block_device *i_bdev;
};
- struct block_device *i_bdev;
struct cdev *i_cdev;
int i_cindex;
_
Patches currently in -mm which might be from tytso@xxxxxxx are
origin.patch
inode_diet-replace-inodeugeneric_ip-with-inodei_private-gfs2.patch
inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default-gfs2.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
statistics-replace-inode-ugeneric_ip-with-i_private.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
