From: Yongqiang Yang <xiaoqiangnk@gmail.com>
To: tytso@mit.edu
Cc: adilger@dilger.ca, linux-ext4@vger.kernel.org,
Yongqiang Yang <xiaoqiangnk@gmail.com>
Subject: [PATCH v2 04/15] ext4: add a function which updates super block
Date: Tue, 30 Aug 2011 16:10:14 +0800 [thread overview]
Message-ID: <1314691825-12295-5-git-send-email-xiaoqiangnk@gmail.com> (raw)
In-Reply-To: <1314691825-12295-1-git-send-email-xiaoqiangnk@gmail.com>
This patch adds a function named ext4_update_super() which updates
super block and whose code is copied from ext4_group_add().
The function will be used by new resize implementation.
Signed-off-by: Yongqiang Yang <xiaoqiangnk@gmail.com>
---
fs/ext4/resize.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 72 insertions(+), 0 deletions(-)
diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
index 66ca671..d20b29c 100644
--- a/fs/ext4/resize.c
+++ b/fs/ext4/resize.c
@@ -831,6 +831,78 @@ static int ext4_setup_new_desc(handle_t *handle, struct super_block *sb,
return err;
}
+/*
+ * ext4_update_super() updates super so that new the added group can be seen
+ * by the filesystem.
+ *
+ * @sb: super block
+ */
+static void ext4_update_super(struct super_block *sb,
+ struct ext4_new_group_data *input)
+{
+ struct ext4_sb_info *sbi = EXT4_SB(sb);
+ struct ext4_super_block *es = sbi->s_es;
+
+ /*
+ * Make the new blocks and inodes valid next. We do this before
+ * increasing the group count so that once the group is enabled,
+ * all of its blocks and inodes are already valid.
+ *
+ * We always allocate group-by-group, then block-by-block or
+ * inode-by-inode within a group, so enabling these
+ * blocks/inodes before the group is live won't actually let us
+ * allocate the new space yet.
+ */
+ ext4_blocks_count_set(es, ext4_blocks_count(es) +
+ input->blocks_count);
+ le32_add_cpu(&es->s_inodes_count, EXT4_INODES_PER_GROUP(sb));
+
+ /*
+ * We need to protect s_groups_count against other CPUs seeing
+ * inconsistent state in the superblock.
+ *
+ * The precise rules we use are:
+ *
+ * * Writers must perform a smp_wmb() after updating all dependent
+ * data and before modifying the groups count
+ *
+ * * Readers must perform an smp_rmb() after reading the groups count
+ * and before reading any dependent data.
+ *
+ * NB. These rules can be relaxed when checking the group count
+ * while freeing data, as we can only allocate from a block
+ * group after serialising against the group count, and we can
+ * only then free after serialising in turn against that
+ * allocation.
+ */
+ smp_wmb();
+
+ /* Update the global fs size fields */
+ sbi->s_groups_count++;
+
+ /* Update the reserved block counts only once the new group is
+ * active. */
+ ext4_r_blocks_count_set(es, ext4_r_blocks_count(es) +
+ input->reserved_blocks);
+
+ /* Update the free space counts */
+ percpu_counter_add(&sbi->s_freeblocks_counter,
+ input->free_blocks_count);
+ percpu_counter_add(&sbi->s_freeinodes_counter,
+ EXT4_INODES_PER_GROUP(sb));
+
+ if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_FLEX_BG) &&
+ sbi->s_log_groups_per_flex) {
+ ext4_group_t flex_group;
+ flex_group = ext4_flex_group(sbi, input->group);
+ atomic_add(input->free_blocks_count,
+ &sbi->s_flex_groups[flex_group].free_blocks);
+ atomic_add(EXT4_INODES_PER_GROUP(sb),
+ &sbi->s_flex_groups[flex_group].free_inodes);
+ }
+
+}
+
/* Add group descriptor data to an existing or new group descriptor block.
* Ensure we handle all possible error conditions _before_ we start modifying
* the filesystem, because we cannot abort the transaction and not have it
--
1.7.5.1
next prev parent reply other threads:[~2011-08-30 8:53 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-30 8:10 (unknown), Yongqiang Yang
2011-08-30 8:10 ` [PATCH v2 01/15] ext4: add a function which extends a group without checking parameters Yongqiang Yang
2011-10-30 13:48 ` Yongqiang Yang
2011-11-01 22:24 ` Ted Ts'o
2011-11-08 1:36 ` Yongqiang Yang
2011-08-30 8:10 ` [PATCH v2 02/15] ext4: add a function which adds a new desc to a fs Yongqiang Yang
2011-08-30 8:10 ` [PATCH v2 03/15] ext4: add a function which sets up a new group desc Yongqiang Yang
2011-08-30 8:10 ` Yongqiang Yang [this message]
2011-08-30 8:10 ` [PATCH v2 05/15] ext4: add a structure which will be used by 64bit-resize interface Yongqiang Yang
2011-08-30 8:10 ` [PATCH v2 06/15] ext4: add a function which sets up group blocks of a flex groups Yongqiang Yang
2011-08-30 8:10 ` [PATCH v2 07/15] ext4: add a function which adds several group descriptors Yongqiang Yang
2011-08-30 8:10 ` [PATCH v2 08/15] ext4: add a function which sets up a flex groups each time Yongqiang Yang
2011-08-30 8:10 ` [PATCH v2 09/15] ext4: enable ext4_update_super() to handle a flex groups Yongqiang Yang
2011-08-30 8:10 ` [PATCH v2 10/15] ext4: pass verify_reserved_gdb() the number of group decriptors Yongqiang Yang
2011-08-30 8:10 ` [PATCH v2 11/15] ext4: add a new function which allocates bitmaps and inode tables Yongqiang Yang
2011-08-30 8:10 ` [PATCH v2 12/15] ext4: add a new function which adds a flex group to a fs Yongqiang Yang
2011-08-30 8:10 ` [PATCH v2 13/15] ext4: add new online resize interface Yongqiang Yang
2011-08-30 8:10 ` [PATCH v2 14/15] ext4: let ext4_group_extend() use common code Yongqiang Yang
2011-08-30 8:10 ` [PATCH v2 15/15] ext4: let ext4_group_add() " Yongqiang Yang
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=1314691825-12295-5-git-send-email-xiaoqiangnk@gmail.com \
--to=xiaoqiangnk@gmail.com \
--cc=adilger@dilger.ca \
--cc=linux-ext4@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).