From patchwork Wed Dec 29 14:12:44 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Young X-Patchwork-Id: 439501 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBUMBEjk000490 for ; Thu, 30 Dec 2010 22:11:28 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753163Ab0L2OMk (ORCPT ); Wed, 29 Dec 2010 09:12:40 -0500 Received: from mail-pv0-f174.google.com ([74.125.83.174]:54021 "EHLO mail-pv0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752539Ab0L2OMj (ORCPT ); Wed, 29 Dec 2010 09:12:39 -0500 Received: by pva4 with SMTP id 4so1881343pva.19 for ; Wed, 29 Dec 2010 06:12:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:mime-version:content-type:content-disposition:user-agent; bh=/dtGTh90zrQ/ecJpcRAN3BXpt2QizBSd58ba6WHcmlY=; b=UFx5208ASE33u81c8v8gP5CxjjbHual6pWM/O7PFG5Gvf3CxLuRab/cJ836IxRZrq3 H3WmWQBzlZEM0y4BsMNz/4Qzdq9YRzWjppTvs5Jz1DQBipTPxGPD5Kkr+tElIVTFBKL1 +muVm93no7EvdHgdxhc4S5X1DJRBR610W+XEc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=Mfr6JHjdURiCgfoI5k2pZE2m55Qy/Fqp55KY0Z1bd/HboKn9k+A72Axi4RPmlKXB3b tHUkKUBhDy5kwHojC8bfoaCcQ69zwG9giBR2hEq1KuXDOcahsTxVkXyo3MOXCRfI2B8s 3cGM9yGRF7/UyYVpE2LfS/ukhesFnEUdxVyhE= Received: by 10.142.166.4 with SMTP id o4mr11908321wfe.58.1293631959187; Wed, 29 Dec 2010 06:12:39 -0800 (PST) Received: from darkstar ([114.240.76.91]) by mx.google.com with ESMTPS id v19sm20918425wfh.0.2010.12.29.06.12.35 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 29 Dec 2010 06:12:37 -0800 (PST) Date: Wed, 29 Dec 2010 22:12:44 +0800 From: Dave Young To: Chris Mason Cc: linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] fix return value when mount fail Message-ID: <20101229141244.GA11081@darkstar> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) 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 (demeter1.kernel.org [140.211.167.41]); Thu, 30 Dec 2010 22:11:28 +0000 (UTC) --- linux-2.6.orig/fs/btrfs/disk-io.c 2010-12-29 21:53:17.473333338 +0800 +++ linux-2.6/fs/btrfs/disk-io.c 2010-12-29 21:57:37.916666672 +0800 @@ -1713,8 +1713,10 @@ struct btrfs_root *open_ctree(struct sup fs_info, BTRFS_ROOT_TREE_OBJECTID); bh = btrfs_read_dev_super(fs_devices->latest_bdev); - if (!bh) + if (!bh) { + err = -EINVAL; goto fail_iput; + } memcpy(&fs_info->super_copy, bh->b_data, sizeof(fs_info->super_copy)); memcpy(&fs_info->super_for_commit, &fs_info->super_copy, --- linux-2.6.orig/fs/btrfs/volumes.c 2010-12-29 21:53:17.503333338 +0800 +++ linux-2.6/fs/btrfs/volumes.c 2010-12-29 21:57:37.920000005 +0800 @@ -598,8 +598,10 @@ static int __btrfs_open_devices(struct b set_blocksize(bdev, 4096); bh = btrfs_read_dev_super(bdev); - if (!bh) + if (!bh) { + ret = -EINVAL; goto error_close; + } disk_super = (struct btrfs_super_block *)bh->b_data; devid = btrfs_stack_device_id(&disk_super->dev_item); @@ -700,7 +702,7 @@ int btrfs_scan_one_device(const char *pa goto error_close; bh = btrfs_read_dev_super(bdev); if (!bh) { - ret = -EIO; + ret = -EINVAL; goto error_close; } disk_super = (struct btrfs_super_block *)bh->b_data; @@ -1193,7 +1195,7 @@ int btrfs_rm_device(struct btrfs_root *r set_blocksize(bdev, 4096); bh = btrfs_read_dev_super(bdev); if (!bh) { - ret = -EIO; + ret = -EINVAL; goto error_close; } disk_super = (struct btrfs_super_block *)bh->b_data;