diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-07 15:45:59 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-20 01:44:21 -0400 |
| commit | e7f59097071f2e193e900093742a4be85839f3d9 (patch) | |
| tree | 35cc747b65d29fdc4f6dea472bf75b540da20453 | |
| parent | 0ee5dc676a5f8fadede608c7281dfedb1ae714ea (diff) | |
| download | linux-3.10-e7f59097071f2e193e900093742a4be85839f3d9.tar.gz linux-3.10-e7f59097071f2e193e900093742a4be85839f3d9.tar.bz2 linux-3.10-e7f59097071f2e193e900093742a4be85839f3d9.zip | |
kill useless checks for sb->s_op == NULL
never is...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | drivers/block/pktcdvd.c | 2 | ||||
| -rw-r--r-- | fs/cachefiles/bind.c | 1 | ||||
| -rw-r--r-- | fs/inode.c | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c index 07a382eaf0a..e133f094ab0 100644 --- 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 e10c4415e8c..622f4696e48 100644 --- 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 43566d17d1b..cbdcab88105 100644 --- 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); |