---

yaml --- r: 36195 b: refs/heads/master c: eaf796e h: refs/heads/master i: 36193: bcc21ff 36191: 916781a v: v3
git-mirror · Sep 27, 2006 · 3c729ff · 3c729ff
1 parent f4fe317
commit 3c729ff
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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;