adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

vfs: remove superflous sb == NULL checks

Browse source 
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:
Christoph Hellwig 2007-05-08 00:25:52 -07:00 committed by Linus Torvalds
parent 578c8183c1
commit acb0c854fa
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs/inode.c
View file

@ -250,7 +250,7 @@ void clear_inode(struct inode *inode)
BUG_ON(inode->i_state & I_CLEAR); BUG_ON(inode->i_state & I_CLEAR);
wait_on_inode(inode); wait_on_inode(inode);
DQUOT_DROP(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); inode->i_sb->s_op->clear_inode(inode);
if (S_ISBLK(inode->i_mode) && inode->i_bdev) if (S_ISBLK(inode->i_mode) && inode->i_bdev)
bd_forget(inode); bd_forget(inode);
@ -1040,7 +1040,7 @@ static void generic_forget_inode(struct inode *inode)
if (!(inode->i_state & (I_DIRTY|I_LOCK))) if (!(inode->i_state & (I_DIRTY|I_LOCK)))
list_move(&inode->i_list, &inode_unused); list_move(&inode->i_list, &inode_unused);
inodes_stat.nr_unused++; inodes_stat.nr_unused++;
if (!sb || (sb->s_flags & MS_ACTIVE)) { if (sb->s_flags & MS_ACTIVE) {
spin_unlock(&inode_lock); spin_unlock(&inode_lock);
return; return;
} }

2
fs/ioctl.c
View file

@ -67,8 +67,6 @@ static int file_ioctl(struct file *filp, unsigned int cmd,
return put_user(res, p); return put_user(res, p);
} }
case FIGETBSZ: case FIGETBSZ:
if (inode->i_sb == NULL)
return -EBADF;
return put_user(inode->i_sb->s_blocksize, p); return put_user(inode->i_sb->s_blocksize, p);
case FIONREAD: case FIONREAD:
return put_user(i_size_read(inode) - filp->f_pos, p); return put_user(i_size_read(inode) - filp->f_pos, p);