commit eaf796e7ef6014f208c409b2b14fddcfaafe7e3a
author Theodore Ts'o <tytso@mit.edu> Wed Sep 27 01:50:48 2006 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Wed Sep 27 08:26:17 2006 -0700
tree 4a872d4b2b086132a9ebdaec1420b8a861ddf6b7
parent 4c1541680f8d189d21dd07b053bc12996574646e

[PATCH] inode-diet: Move i_bdev into a union

Move the i_bdev pointer in struct inode into a union.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

fs/inode.c

diff --git a/fs/inode.c b/fs/inode.c
index 77e2547..41b4622 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -254,7 +254,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);

include/linux/fs.h

diff --git a/include/linux/fs.h b/include/linux/fs.h
index ca695fc..98ff684 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -531,8 +531,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;