From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoph Hellwig Subject: [PATCH] vfs: remove superflous sb == NULL checks Date: Wed, 7 Mar 2007 16:19:59 +0100 Message-ID: <20070307151959.GA15230@lst.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: linux-fsdevel@vger.kernel.org To: akpm@osdl.org Return-path: Received: from verein.lst.de ([213.95.11.210]:46989 "EHLO mail.lst.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751915AbXCGPUF (ORCPT ); Wed, 7 Mar 2007 10:20:05 -0500 Content-Disposition: inline Sender: linux-fsdevel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org inode->i_sb is always set, not need to check for it. Signed-off-by: Christoph Hellwig Index: linux-2.6/fs/inode.c =================================================================== --- linux-2.6.orig/fs/inode.c 2007-02-24 10:37:57.000000000 +0100 +++ linux-2.6/fs/inode.c 2007-02-24 10:38:50.000000000 +0100 @@ -251,7 +251,7 @@ 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); @@ -1041,7 +1041,7 @@ 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; } Index: linux-2.6/fs/ioctl.c =================================================================== --- linux-2.6.orig/fs/ioctl.c 2007-02-24 10:39:42.000000000 +0100 +++ linux-2.6/fs/ioctl.c 2007-02-24 10:39:53.000000000 +0100 @@ -67,8 +67,6 @@ 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);