linux-ext4.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: <gregkh@suse.de>
To: frederic.bohe@bull.net, gregkh@suse.de,
	linux-ext4@vger.kernel.org, tytso@mit.edu
Cc: <stable@kernel.org>, <stable-commits@vger.kernel.org>
Subject: patch ext4-update-flex_bg-free-blocks-and-free-inodes-counters-when-resizing.patch added to 2.6.27-stable tree
Date: Wed, 03 Dec 2008 10:56:02 -0800	[thread overview]
Message-ID: <20081203185929.C024D4904D@coco.kroah.org> (raw)
In-Reply-To: <1226851540-8032-2-git-send-email-tytso@mit.edu>


This is a note to let you know that we have just queued up the patch titled

    Subject: ext4: Update flex_bg free blocks and free inodes counters when resizing.

to the 2.6.27-stable tree.  Its filename is

    ext4-update-flex_bg-free-blocks-and-free-inodes-counters-when-resizing.patch

A git repo of this tree can be found at 
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary


>From tytso@mit.edu  Wed Dec  3 09:54:56 2008
From: Frederic Bohe <frederic.bohe@bull.net>
Date: Sun, 16 Nov 2008 11:05:21 -0500
Subject: ext4: Update flex_bg free blocks and free inodes counters when resizing.
To: stable@kernel.org
Cc: Frederic Bohe <frederic.bohe@bull.net>, Ext4 Developers List <linux-ext4@vger.kernel.org>, "Theodore Ts'o" <tytso@mit.edu>
Message-ID: <1226851540-8032-2-git-send-email-tytso@mit.edu>


From: Frederic Bohe <frederic.bohe@bull.net>

(cherry picked from commit c62a11fd9555007b1caab83b5bcbb443a43e32bb)

This fixes a bug which prevented the newly created inodes after a
resize from being used on filesystems with flex_bg.

Signed-off-by: Frederic Bohe <frederic.bohe@bull.net>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
 fs/ext4/resize.c |    9 +++++++++
 fs/ext4/super.c  |    7 +++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

--- a/fs/ext4/resize.c
+++ b/fs/ext4/resize.c
@@ -929,6 +929,15 @@ int ext4_group_add(struct super_block *s
 	percpu_counter_add(&sbi->s_freeinodes_counter,
 			   EXT4_INODES_PER_GROUP(sb));
 
+	if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_FLEX_BG)) {
+		ext4_group_t flex_group;
+		flex_group = ext4_flex_group(sbi, input->group);
+		sbi->s_flex_groups[flex_group].free_blocks +=
+			input->free_blocks_count;
+		sbi->s_flex_groups[flex_group].free_inodes +=
+			EXT4_INODES_PER_GROUP(sb);
+	}
+
 	ext4_journal_dirty_metadata(handle, sbi->s_sbh);
 	sb->s_dirt = 1;
 
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1504,8 +1504,11 @@ static int ext4_fill_flex_info(struct su
 	sbi->s_log_groups_per_flex = sbi->s_es->s_log_groups_per_flex;
 	groups_per_flex = 1 << sbi->s_log_groups_per_flex;
 
-	flex_group_count = (sbi->s_groups_count + groups_per_flex - 1) /
-		groups_per_flex;
+	/* We allocate both existing and potentially added groups */
+	flex_group_count = ((sbi->s_groups_count + groups_per_flex - 1) +
+			    ((sbi->s_es->s_reserved_gdt_blocks +1 ) <<
+			      EXT4_DESC_PER_BLOCK_BITS(sb))) /
+			   groups_per_flex;
 	sbi->s_flex_groups = kzalloc(flex_group_count *
 				     sizeof(struct flex_groups), GFP_KERNEL);
 	if (sbi->s_flex_groups == NULL) {


Patches currently in stable-queue which might be from frederic.bohe@bull.net are

queue-2.6.27/ext4-update-flex_bg-free-blocks-and-free-inodes-counters-when-resizing.patch
queue-2.6.27/ext4-fix-initialization-of-uninit-bitmap-blocks.patch
queue-2.6.27/ext4-add-checksum-calculation-when-clearing-uninit-flag-in-ext4_new_inode.patch

      parent reply	other threads:[~2008-12-03 18:59 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-11-16 16:05 [FOR-STABLE 0/20] Theodore Ts'o
2008-11-16 16:05 ` [FOR-STABLE 01/20] Update flex_bg free blocks and free inodes counters when resizing Theodore Ts'o
2008-11-16 16:05   ` [FOR-STABLE 02/20] ext4: fix #11321: create /proc/ext4/*/stats more carefully Theodore Ts'o
2008-11-16 16:05     ` [FOR-STABLE 03/20] jbd2: fix /proc setup for devices that contain '/' in their names Theodore Ts'o
2008-11-16 16:05       ` [FOR-STABLE 04/20] ext4: add missing unlock in ext4_check_descriptors() on error path Theodore Ts'o
2008-11-16 16:05         ` [FOR-STABLE 05/20] ext4: elevate write count for migrate ioctl Theodore Ts'o
2008-11-16 16:05           ` [FOR-STABLE 06/20] ext4: Renumber EXT4_IOC_MIGRATE Theodore Ts'o
2008-11-16 16:05             ` [FOR-STABLE 07/20] ext4/jbd2: Avoid WARN() messages when failing to write to the superblock Theodore Ts'o
2008-11-16 16:05               ` [FOR-STABLE 08/20] ext4: fix initialization of UNINIT bitmap blocks Theodore Ts'o
2008-11-16 16:05                 ` [FOR-STABLE 09/20] jbd2: abort instead of waiting for nonexistent transaction Theodore Ts'o
2008-11-16 16:05                   ` [FOR-STABLE 10/20] jbd2: Fix buffer head leak when writing the commit block Theodore Ts'o
2008-11-16 16:05                     ` [FOR-STABLE 11/20] ext4: fix xattr deadlock Theodore Ts'o
2008-11-16 16:05                       ` [FOR-STABLE 12/20] ext4: Free ext4_prealloc_space using kmem_cache_free Theodore Ts'o
2008-11-16 16:05                         ` [FOR-STABLE 13/20] ext4: Do mballoc init before doing filesystem recovery Theodore Ts'o
2008-11-16 16:05                           ` [FOR-STABLE 14/20] ext4: Fix duplicate entries returned from getdents() system call Theodore Ts'o
2008-11-16 16:05                             ` [FOR-STABLE 15/20] jbd2: don't give up looking for space so easily in __jbd2_log_wait_for_space Theodore Ts'o
2008-11-16 16:05                               ` [FOR-STABLE 16/20] ext4: Convert to host order before using the values Theodore Ts'o
2008-11-16 16:05                                 ` [FOR-STABLE 17/20] ext4: wait on all pending commits in ext4_sync_fs() Theodore Ts'o
2008-11-16 16:05                                   ` [FOR-STABLE 18/20] ext4: calculate journal credits correctly Theodore Ts'o
2008-11-16 16:05                                     ` [FOR-STABLE 19/20] ext4: Mark the buffer_heads as dirty and uptodate after prepare_write Theodore Ts'o
2008-11-16 16:05                                       ` [FOR-STABLE 20/20] ext4: add checksum calculation when clearing UNINIT flag in ext4_new_inode Theodore Ts'o
2008-12-03 18:55                                         ` patch ext4-add-checksum-calculation-when-clearing-uninit-flag-in-ext4_new_inode.patch added to 2.6.27-stable tree gregkh
2008-12-03 18:56                                       ` patch ext4-mark-the-buffer_heads-as-dirty-and-uptodate-after-prepare_write.patch " gregkh
2008-12-03 18:55                                     ` patch ext4-calculate-journal-credits-correctly.patch " gregkh
2008-12-03 18:56                                   ` patch ext4-wait-on-all-pending-commits-in-ext4_sync_fs.patch " gregkh
2008-12-03 18:55                                 ` patch ext4-convert-to-host-order-before-using-the-values.patch " gregkh
2008-12-03 18:56                               ` patch jbd2-don-t-give-up-looking-for-space-so-easily-in-__jbd2_log_wait_for_space.patch " gregkh
2008-12-03 18:55                             ` patch ext4-fix-duplicate-entries-returned-from-getdents-system-call.patch " gregkh
2008-12-03 18:55                           ` patch ext4-do-mballoc-init-before-doing-filesystem-recovery.patch " gregkh
2008-12-03 18:55                         ` patch ext4-free-ext4_prealloc_space-using-kmem_cache_free.patch " gregkh
2008-12-03 18:55                       ` patch ext4-fix-xattr-deadlock.patch " gregkh
2008-12-03 18:56                     ` patch jbd2-fix-buffer-head-leak-when-writing-the-commit-block.patch " gregkh
2008-12-03 18:56                   ` patch jbd2-abort-instead-of-waiting-for-nonexistent-transaction.patch " gregkh
2008-12-03 18:55                 ` patch ext4-fix-initialization-of-uninit-bitmap-blocks.patch " gregkh
2008-12-03 18:56               ` patch ext4-jbd2-avoid-warn-messages-when-failing-to-write-to-the-superblock.patch " gregkh
2008-12-03 18:56             ` patch ext4-renumber-ext4_ioc_migrate.patch " gregkh
2008-12-03 18:55           ` patch ext4-elevate-write-count-for-migrate-ioctl.patch " gregkh
2008-12-03 18:55         ` patch ext4-add-missing-unlock-in-ext4_check_descriptors-on-error-path.patch " gregkh
2008-12-03 18:56       ` patch jbd2-fix-proc-setup-for-devices-that-contain-in-their-names.patch " gregkh
2008-12-03 18:55     ` patch ext4-fix-11321-create-proc-ext4-stats-more-carefully.patch " gregkh
2008-12-03 18:56   ` gregkh [this message]

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=20081203185929.C024D4904D@coco.kroah.org \
    --to=gregkh@suse.de \
    --cc=frederic.bohe@bull.net \
    --cc=linux-ext4@vger.kernel.org \
    --cc=stable-commits@vger.kernel.org \
    --cc=stable@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).