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) |
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 07a382eaf0a8..e133f094ab08 100644 --- a/drivers/block/pktcdvd.c +++ b/drivers/block/pktcdvd.c | |||
@@ -1206,7 +1206,7 @@ static int pkt_start_recovery(struct packet_data *pkt) | |||
1206 | if (!sb) | 1206 | if (!sb) |
1207 | return 0; | 1207 | return 0; |
1208 | 1208 | ||
1209 | if (!sb->s_op || !sb->s_op->relocate_blocks) | 1209 | if (!sb->s_op->relocate_blocks) |
1210 | goto out; | 1210 | goto out; |
1211 | 1211 | ||
1212 | old_block = pkt->sector / (CD_FRAMESIZE >> 9); | 1212 | old_block = pkt->sector / (CD_FRAMESIZE >> 9); |
diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c index e10c4415e8c3..622f4696e484 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) | |||
129 | !root->d_inode->i_op->mkdir || | 129 | !root->d_inode->i_op->mkdir || |
130 | !root->d_inode->i_op->setxattr || | 130 | !root->d_inode->i_op->setxattr || |
131 | !root->d_inode->i_op->getxattr || | 131 | !root->d_inode->i_op->getxattr || |
132 | !root->d_sb->s_op || | ||
133 | !root->d_sb->s_op->statfs || | 132 | !root->d_sb->s_op->statfs || |
134 | !root->d_sb->s_op->sync_fs) | 133 | !root->d_sb->s_op->sync_fs) |
135 | goto error_unsupported; | 134 | goto error_unsupported; |
diff --git a/fs/inode.c b/fs/inode.c index 43566d17d1b8..cbdcab88105f 100644 --- a/fs/inode.c +++ b/fs/inode.c | |||
@@ -1331,7 +1331,7 @@ static void iput_final(struct inode *inode) | |||
1331 | 1331 | ||
1332 | WARN_ON(inode->i_state & I_NEW); | 1332 | WARN_ON(inode->i_state & I_NEW); |
1333 | 1333 | ||
1334 | if (op && op->drop_inode) | 1334 | if (op->drop_inode) |
1335 | drop = op->drop_inode(inode); | 1335 | drop = op->drop_inode(inode); |
1336 | else | 1336 | else |
1337 | drop = generic_drop_inode(inode); | 1337 | drop = generic_drop_inode(inode); |