kill useless checks for sb->s_op == NULL

never is...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index 07a382e..e133f09 100644 (file)
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -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);

diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
index e10c441..622f469 100644 (file)
--- a/fs/cachefiles/bind.c
+++ b/fs/cachefiles/bind.c
@@ -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;

diff --git a/fs/inode.c b/fs/inode.c
index 43566d1..cbdcab8 100644 (file)
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -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);