mirror of
https://github.com/joel16/android_kernel_sony_msm8994.git
synced 2024-11-29 07:01:10 +00:00
vfs: remove superflous sb == NULL checks
inode->i_sb is always set, not need to check for it. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
578c8183c1
commit
acb0c854fa
@ -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;
|
||||
}
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user