From patchwork Thu Mar 25 12:33:27 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miao Xie X-Patchwork-Id: 88214 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2PCXDtH030336 for ; Thu, 25 Mar 2010 12:33:13 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752014Ab0CYMdM (ORCPT ); Thu, 25 Mar 2010 08:33:12 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:64147 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1750903Ab0CYMdM (ORCPT ); Thu, 25 Mar 2010 08:33:12 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 6398417003F; Thu, 25 Mar 2010 20:33:11 +0800 (CST) Received: from fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id o2PCVquH006000; Thu, 25 Mar 2010 20:31:52 +0800 Received: from [127.0.0.1] (unknown [10.167.141.211]) by fnst.cn.fujitsu.com (Postfix) with ESMTPA id 75341DC220; Thu, 25 Mar 2010 20:35:37 +0800 (CST) Message-ID: <4BAB5817.8020803@cn.fujitsu.com> Date: Thu, 25 Mar 2010 20:33:27 +0800 From: Miao Xie Reply-To: miaox@cn.fujitsu.com User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; zh-CN; rv:1.9.1.8) Gecko/20100227 Thunderbird/3.0.3 MIME-Version: 1.0 To: Chris Mason , Linux Btrfs Subject: [PATCH 09/18] btrfs: Fix return value of read_extent_buffer_pages() when lock page failed Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 25 Mar 2010 12:33:13 +0000 (UTC) diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index bdfbfa6..3194c79 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -3419,8 +3419,10 @@ int read_extent_buffer_pages(struct extent_io_tree *tree, for (i = start_i; i < num_pages; i++) { page = extent_buffer_page(eb, i); if (!wait) { - if (!trylock_page(page)) + if (!trylock_page(page)) { + ret = -EIO; goto unlock_exit; + } } else { lock_page(page); }