From 3c729ff15d3c910762337fa6446c016c28733905 Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso@mit.edu>
Date: Wed, 27 Sep 2006 01:50:48 -0700
Subject: [PATCH] --- yaml --- r: 36195 b: refs/heads/master c:
 eaf796e7ef6014f208c409b2b14fddcfaafe7e3a h: refs/heads/master i:   36193:
 bcc21ffcd4e3c42def1fc69336fed45985260348   36191:
 916781ad7b63e960ca7f294da3a2b0c3ef9105db v: v3

---
 [refs]                   | 2 +-
 trunk/fs/inode.c         | 2 +-
 trunk/include/linux/fs.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b387f6a9af8b..42e73ee7e077 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c1541680f8d189d21dd07b053bc12996574646e
+refs/heads/master: eaf796e7ef6014f208c409b2b14fddcfaafe7e3a
diff --git a/trunk/fs/inode.c b/trunk/fs/inode.c
index 77e254792025..41b462232f7f 100644
--- a/trunk/fs/inode.c
+++ b/trunk/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 --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h
index ca695fc8d69c..98ff684a5b1c 100644
--- a/trunk/include/linux/fs.h
+++ b/trunk/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;