فهرست منبع

kill useless checks for sb->s_op == NULL

never is...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Al Viro 14 سال پیش
والد
کامیت
e7f5909707
3فایلهای تغییر یافته به همراه2 افزوده شده و 3 حذف شده
  1. 1 1
      drivers/block/pktcdvd.c
  2. 0 1
      fs/cachefiles/bind.c
  3. 1 1
      fs/inode.c

+ 1 - 1
drivers/block/pktcdvd.c

@@ -1206,7 +1206,7 @@ static int pkt_start_recovery(struct packet_data *pkt)
 	if (!sb)
 	if (!sb)
 		return 0;
 		return 0;
 
 
-	if (!sb->s_op || !sb->s_op->relocate_blocks)
+	if (!sb->s_op->relocate_blocks)
 		goto out;
 		goto out;
 
 
 	old_block = pkt->sector / (CD_FRAMESIZE >> 9);
 	old_block = pkt->sector / (CD_FRAMESIZE >> 9);

+ 0 - 1
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->mkdir ||
 	    !root->d_inode->i_op->setxattr ||
 	    !root->d_inode->i_op->setxattr ||
 	    !root->d_inode->i_op->getxattr ||
 	    !root->d_inode->i_op->getxattr ||
-	    !root->d_sb->s_op ||
 	    !root->d_sb->s_op->statfs ||
 	    !root->d_sb->s_op->statfs ||
 	    !root->d_sb->s_op->sync_fs)
 	    !root->d_sb->s_op->sync_fs)
 		goto error_unsupported;
 		goto error_unsupported;

+ 1 - 1
fs/inode.c

@@ -1331,7 +1331,7 @@ static void iput_final(struct inode *inode)
 
 
 	WARN_ON(inode->i_state & I_NEW);
 	WARN_ON(inode->i_state & I_NEW);
 
 
-	if (op && op->drop_inode)
+	if (op->drop_inode)
 		drop = op->drop_inode(inode);
 		drop = op->drop_inode(inode);
 	else
 	else
 		drop = generic_drop_inode(inode);
 		drop = generic_drop_inode(inode);