diff options
| -rw-r--r-- | fs/inode.c | 4 | ||||
| -rw-r--r-- | fs/ioctl.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/fs/inode.c b/fs/inode.c index b4296bf6273..c03089421b6 100644 --- a/fs/inode.c +++ b/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/fs/ioctl.c b/fs/ioctl.c index ff61772ceed..479c1038ed4 100644 --- a/fs/ioctl.c +++ b/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); |