kill useless checks for sb->s_op == NULL
authorAl Viro <viro@zeniv.linux.org.uk>
Thu, 7 Jul 2011 19:45:59 +0000 (15:45 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Wed, 20 Jul 2011 05:44:21 +0000 (01:44 -0400)
never is...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
drivers/block/pktcdvd.c
fs/cachefiles/bind.c
fs/inode.c

index 07a382eaf0a86b8b0a8f9f30a57dfe3e3e68f6a9..e133f094ab08f40bea4174b83a1253be45a56e4b 100644 (file)
@@ -1206,7 +1206,7 @@ static int pkt_start_recovery(struct packet_data *pkt)
        if (!sb)
                return 0;
 
-       if (!sb->s_op || !sb->s_op->relocate_blocks)
+       if (!sb->s_op->relocate_blocks)
                goto out;
 
        old_block = pkt->sector / (CD_FRAMESIZE >> 9);
index e10c4415e8c3bfa744463054ef39088a7ef7abdc..622f4696e48435f47759ab35869ce692cc697188 100644 (file)
@@ -129,7 +129,6 @@ static int cachefiles_daemon_add_cache(struct cachefiles_cache *cache)
            !root->d_inode->i_op->mkdir ||
            !root->d_inode->i_op->setxattr ||
            !root->d_inode->i_op->getxattr ||
-           !root->d_sb->s_op ||
            !root->d_sb->s_op->statfs ||
            !root->d_sb->s_op->sync_fs)
                goto error_unsupported;
index 43566d17d1b85643820f0c943f35f866869b9a80..cbdcab88105f8c596c2d2abe516da378377947e1 100644 (file)
@@ -1331,7 +1331,7 @@ static void iput_final(struct inode *inode)
 
        WARN_ON(inode->i_state & I_NEW);
 
-       if (op && op->drop_inode)
+       if (op->drop_inode)
                drop = op->drop_inode(inode);
        else
                drop = generic_drop_inode(inode);