[RFC] [PATCH 3/8] inode-diet: Move i_bdev into a union

Theodore Tso
2006-06-19T15:32:03Z

[-- Attachment #1: inode-slim-3 --]
[-- Type: text/plain, Size: 1520 bytes --]

Move the i_bdev pointer in struct inode into a union.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

Index: linux-2.6.17/include/linux/fs.h
===================================================================
--- linux-2.6.17.orig/include/linux/fs.h 2006-06-18 19:39:52.000000000 -0400
+++ linux-2.6.17/include/linux/fs.h 2006-06-18 19:46:10.000000000 -0400
@@ -511,8 +511,8 @@
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;

Index: linux-2.6.17/fs/block_dev.c
===================================================================
--- linux-2.6.17.orig/fs/block_dev.c 2006-06-18 19:37:14.000000000 -0400
+++ linux-2.6.17/fs/block_dev.c 2006-06-18 19:46:10.000000000 -0400
@@ -439,7 +439,7 @@
void bd_forget(struct inode *inode)
{
spin_lock(&bdev_lock);
- if (inode->i_bdev)
+ if (S_ISBLK(inode->i_mode) && inode->i_bdev)
__bd_forget(inode);
spin_unlock(&bdev_lock);
}
Index: linux-2.6.17/fs/inode.c
===================================================================
--- linux-2.6.17.orig/fs/inode.c 2006-06-18 19:42:16.000000000 -0400
+++ linux-2.6.17/fs/inode.c 2006-06-18 19:46:10.000000000 -0400
@@ -255,7 +255,7 @@
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);

--