From 0d3d223f963b3764c6587e880b56e92525032220 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Thu, 7 Jul 2011 15:45:59 -0400 Subject: [PATCH] --- yaml --- r: 257356 b: refs/heads/master c: e7f59097071f2e193e900093742a4be85839f3d9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/pktcdvd.c | 2 +- trunk/fs/cachefiles/bind.c | 1 - trunk/fs/inode.c | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 28bff2b25c62..a49a426cae7c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ee5dc676a5f8fadede608c7281dfedb1ae714ea +refs/heads/master: e7f59097071f2e193e900093742a4be85839f3d9 diff --git a/trunk/drivers/block/pktcdvd.c b/trunk/drivers/block/pktcdvd.c index 07a382eaf0a8..e133f094ab08 100644 --- a/trunk/drivers/block/pktcdvd.c +++ b/trunk/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/trunk/fs/cachefiles/bind.c b/trunk/fs/cachefiles/bind.c index e10c4415e8c3..622f4696e484 100644 --- a/trunk/fs/cachefiles/bind.c +++ b/trunk/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/trunk/fs/inode.c b/trunk/fs/inode.c index 43566d17d1b8..cbdcab88105f 100644 --- a/trunk/fs/inode.c +++ b/trunk/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);