From b70b9c085ab9ba658a5a96a53d1fc254c0a94e18 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Tue, 8 May 2007 00:25:52 -0700
Subject: [PATCH] --- yaml --- r: 54581 b: refs/heads/master c:
 acb0c854fa9483fa85e377b9f342352ea814a580 h: refs/heads/master i:   54579:
 47a8c6df573438e3c9dd518601df0a4c76f13399 v: v3

---
 [refs]           | 2 +-
 trunk/fs/inode.c | 4 ++--
 trunk/fs/ioctl.c | 2 --
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 9f48b834a755..e8b899c4e7c6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 578c8183c116e623d53b05d4c79762d053c7090f
+refs/heads/master: acb0c854fa9483fa85e377b9f342352ea814a580
diff --git a/trunk/fs/inode.c b/trunk/fs/inode.c
index b4296bf62739..c03089421b6f 100644
--- a/trunk/fs/inode.c
+++ b/trunk/fs/inode.c
@@ -250,7 +250,7 @@ void clear_inode(struct inode *inode)
 	BUG_ON(inode->i_state & I_CLEAR);
 	wait_on_inode(inode);
 	DQUOT_DROP(inode);
-	if (inode->i_sb && inode->i_sb->s_op->clear_inode)
+	if (inode->i_sb->s_op->clear_inode)
 		inode->i_sb->s_op->clear_inode(inode);
 	if (S_ISBLK(inode->i_mode) && inode->i_bdev)
 		bd_forget(inode);
@@ -1040,7 +1040,7 @@ static void generic_forget_inode(struct inode *inode)
 		if (!(inode->i_state & (I_DIRTY|I_LOCK)))
 			list_move(&inode->i_list, &inode_unused);
 		inodes_stat.nr_unused++;
-		if (!sb || (sb->s_flags & MS_ACTIVE)) {
+		if (sb->s_flags & MS_ACTIVE) {
 			spin_unlock(&inode_lock);
 			return;
 		}
diff --git a/trunk/fs/ioctl.c b/trunk/fs/ioctl.c
index ff61772ceedd..479c1038ed4a 100644
--- a/trunk/fs/ioctl.c
+++ b/trunk/fs/ioctl.c
@@ -67,8 +67,6 @@ static int file_ioctl(struct file *filp, unsigned int cmd,
 			return put_user(res, p);
 		}
 		case FIGETBSZ:
-			if (inode->i_sb == NULL)
-				return -EBADF;
 			return put_user(inode->i_sb->s_blocksize, p);
 		case FIONREAD:
 			return put_user(i_size_read(inode) - filp->f_pos, p);