From: akpm@osdl.org Subject: + ext4-balloc-use-io_error-label.patch added to -mm tree Date: Wed, 29 Nov 2006 14:17:08 -0800 Message-ID: <200611292217.kATMH8I6013210@shell0.pdx.osdl.net> Cc: hugh@veritas.com, cmm@us.ibm.com, linux-ext4@vger.kernel.org Return-path: Received: from smtp.osdl.org ([65.172.181.25]:62661 "EHLO smtp.osdl.org") by vger.kernel.org with ESMTP id S1758872AbWK2WXu (ORCPT ); Wed, 29 Nov 2006 17:23:50 -0500 To: mm-commits@vger.kernel.org Sender: linux-ext4-owner@vger.kernel.org List-Id: linux-ext4.vger.kernel.org The patch titled ext4 balloc: use io_error label has been added to the -mm tree. Its filename is ext4-balloc-use-io_error-label.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: ext4 balloc: use io_error label From: Hugh Dickins ext4_new_blocks has a nice io_error label for setting -EIO, so goto that in the one place that doesn't already use it. Signed-off-by: Mingming Cao Signed-off-by: Hugh Dickins Cc: Signed-off-by: Andrew Morton --- fs/ext4/balloc.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff -puN fs/ext4/balloc.c~ext4-balloc-use-io_error-label fs/ext4/balloc.c --- a/fs/ext4/balloc.c~ext4-balloc-use-io_error-label +++ a/fs/ext4/balloc.c @@ -1529,10 +1529,8 @@ retry_alloc: if (group_no >= ngroups) group_no = 0; gdp = ext4_get_group_desc(sb, group_no, &gdp_bh); - if (!gdp) { - *errp = -EIO; - goto out; - } + if (!gdp) + goto io_error; free_blocks = le16_to_cpu(gdp->bg_free_blocks_count); /* * skip this group if the number of _ Patches currently in -mm which might be from hugh@veritas.com are git-powerpc.patch __unmap_hugepage_range-add-comment.patch shared-page-table-for-hugetlb-page-v4.patch htlb-forget-rss-with-pt-sharing.patch mlock-cleanup.patch always-print-out-the-header-line-in-proc-swaps.patch reject-corrupt-swapfiles-earlier.patch kill-install_file_ptes-pte_val.patch honour-mnt_noexec-for-access.patch ext3-fix-reservation-extension.patch ext4-fix-reservation-extension.patch ext4-balloc-reset-windowsz-when-full.patch ext4-balloc-fix-off-by-one-against-grp_goal.patch ext4-balloc-fix-off-by-one-against-rsv_end.patch ext4-balloc-say-rb_entry-not-list_entry.patch ext4-balloc-use-io_error-label.patch ext4-balloc-fix-_with_rsv-freeze.patch ext3-balloc-reset-windowsz-when-full.patch ext3-balloc-fix-off-by-one-against-grp_goal.patch ext3-balloc-fix-off-by-one-against-rsv_end.patch ext3-balloc-say-rb_entry-not-list_entry.patch ext3-balloc-use-io_error-label.patch ext3-balloc-fix-_with_rsv-freeze.patch ext2-reservations.patch ext2-balloc-fix-_with_rsv-freeze.patch ext2-balloc-reset-windowsz-when-full.patch ext2-balloc-fix-off-by-one-against-rsv_end.patch ext2-balloc-fix-off-by-one-against-grp_goal.patch ext2-balloc-say-rb_entry-not-list_entry.patch ext2-balloc-use-io_error-label.patch generic-bug-implementation.patch generic-bug-implementation-handle-bug=n.patch generic-bug-for-i386.patch generic-bug-for-x86-64.patch bug-test-1.patch tty-switch-to-ktermios-powerpc-fix.patch