stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org, Nagachandra P <nagachandra@gmail.com>,
	"Theodore Tso" <tytso@mit.edu>
Subject: [ 21/24] ext4: dont allow ext4_free_blocks() to fail due to ENOMEM
Date: Thu, 18 Jul 2013 19:24:53 -0700	[thread overview]
Message-ID: <20130719022405.468438506@linuxfoundation.org> (raw)
In-Reply-To: <20130719022404.015008451@linuxfoundation.org>

3.4-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Theodore Ts'o <tytso@mit.edu>

commit e7676a704ee0a1ef71a6b23760b5a8f6896cb1a1 upstream.

The filesystem should not be marked inconsistent if ext4_free_blocks()
is not able to allocate memory.  Unfortunately some callers (most
notably ext4_truncate) don't have a way to reflect an error back up to
the VFS.  And even if we did, most userspace applications won't deal
with most system calls returning ENOMEM anyway.

Reported-by: Nagachandra P <nagachandra@gmail.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 fs/ext4/mballoc.c |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -4639,11 +4639,16 @@ do_more:
 		 * blocks being freed are metadata. these blocks shouldn't
 		 * be used until this transaction is committed
 		 */
+	retry:
 		new_entry = kmem_cache_alloc(ext4_free_data_cachep, GFP_NOFS);
 		if (!new_entry) {
-			ext4_mb_unload_buddy(&e4b);
-			err = -ENOMEM;
-			goto error_return;
+			/*
+			 * We use a retry loop because
+			 * ext4_free_blocks() is not allowed to fail.
+			 */
+			cond_resched();
+			congestion_wait(BLK_RW_ASYNC, HZ/50);
+			goto retry;
 		}
 		new_entry->efd_start_cluster = bit;
 		new_entry->efd_group = block_group;



  parent reply	other threads:[~2013-07-19  2:24 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-19  2:24 [ 00/24] 3.4.54-stable review Greg Kroah-Hartman
2013-07-19  2:24 ` [ 01/24] CIFS use sensible file nlink values if unprovided Greg Kroah-Hartman
2013-07-19  2:24 ` [ 02/24] rtlwifi: rtl8192cu: Add new USB ID for TP-Link TL-WN8200ND Greg Kroah-Hartman
2013-07-19  2:24 ` [ 03/24] rtlwifi: rtl8192cu: Fix duplicate if test Greg Kroah-Hartman
2013-07-19  2:24 ` [ 04/24] jbd2: fix theoretical race in jbd2__journal_restart Greg Kroah-Hartman
2013-07-19  2:24 ` [ 05/24] ext3,ext4: dont mess with dir_file->f_pos in htree_dirblock_to_tree() Greg Kroah-Hartman
2013-07-19  2:24 ` [ 06/24] USB: option,qcserial: move Novatel Gobi1K IDs to qcserial Greg Kroah-Hartman
2013-07-19  2:24 ` [ 07/24] usb: gadget: f_mass_storage: add missing memory barrier for thread_wakeup_needed Greg Kroah-Hartman
2013-07-19  2:24 ` [ 08/24] xhci: check for failed dma pool allocation Greg Kroah-Hartman
2013-07-19  2:24 ` [ 09/24] usb: host: xhci-plat: release mem region while removing module Greg Kroah-Hartman
2013-07-19  2:24 ` [ 10/24] pcmcia: at91_cf: fix gpio_get_value in at91_cf_get_status Greg Kroah-Hartman
2013-07-19  2:24 ` [ 11/24] xen/time: remove blocked time accounting from xen "clockchip" Greg Kroah-Hartman
2013-07-19  2:24 ` [ 12/24] genirq: Fix can_request_irq() for IRQs without an action Greg Kroah-Hartman
2013-07-19  2:24 ` [ 13/24] drivers/rtc/rtc-rv3029c2.c: fix disabling AIE irq Greg Kroah-Hartman
2013-07-19  2:24 ` [ 14/24] ACPI / EC: Add HP Folio 13 to ec_dmi_table in order to skip DSDT scan Greg Kroah-Hartman
2013-07-19  2:24 ` [ 15/24] ocfs2: xattr: fix inlined xattr reflink Greg Kroah-Hartman
2013-07-19  2:24 ` [ 16/24] ahci: Add AMD CZ SATA device ID Greg Kroah-Hartman
2013-07-19  2:24 ` [ 17/24] ahci: remove pmp link online check in FBS EH Greg Kroah-Hartman
2013-07-19  2:24 ` [ 18/24] timer: Fix jiffies wrap behavior of round_jiffies_common() Greg Kroah-Hartman
2013-07-19  2:24 ` [ 19/24] ext4: fix data offset overflow in ext4_xattr_fiemap() on 32-bit archs Greg Kroah-Hartman
2013-07-19  2:24 ` [ 20/24] ext4: fix overflow when counting used blocks on 32-bit architectures Greg Kroah-Hartman
2013-07-19  2:24 ` Greg Kroah-Hartman [this message]
2013-07-19  2:24 ` [ 22/24] ARM: 7765/1: perf: Record the user-mode PC in the call chain Greg Kroah-Hartman
2013-07-19  2:24 ` [ 23/24] drivers/dma/pl330.c: fix locking in pl330_free_chan_resources() Greg Kroah-Hartman
2013-07-19  2:24 ` [ 24/24] Handle big endianness in NTLM (ntlmv2) authentication Greg Kroah-Hartman
2013-07-19 23:19 ` [ 00/24] 3.4.54-stable review Shuah Khan
2013-07-21  0:37 ` Satoru Takeuchi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130719022405.468438506@linuxfoundation.org \
    --to=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=nagachandra@gmail.com \
    --cc=stable@vger.kernel.org \
    --cc=tytso@mit.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).