From: Artem Bityutskiy <dedekind1@gmail.com>
To: Jan Kara <jack@suse.cz>
Cc: Ext4 Mailing List <linux-ext4@vger.kernel.org>,
Linux FS Maling List <linux-fsdevel@vger.kernel.org>,
Linux Kernel Maling List <linux-kernel@vger.kernel.org>
Subject: [PATCH 4/8] ext2: intruduce ext2_mark_super_dirty
Date: Wed, 21 Mar 2012 18:14:31 +0200 [thread overview]
Message-ID: <1332346475-1441-5-git-send-email-dedekind1@gmail.com> (raw)
In-Reply-To: <1332346475-1441-1-git-send-email-dedekind1@gmail.com>
From: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Introduce a helper function for marking the superblock as dirty. This is just a
preparation for further changes which will make ext2 fully manage its own
superblock and not rely on VFS services like periodic '->write_super()'
callback invocations.
Note: the final goal is to get rid of the 'sync_supers()' kernel thread which
wakes up every 5 seconds and even if there is nothing to do. Thus, we are
pushing superblock management from VFS down to file-systems.
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
---
fs/ext2/balloc.c | 4 ++--
fs/ext2/ext2.h | 1 +
fs/ext2/ialloc.c | 4 ++--
fs/ext2/super.c | 5 +++++
fs/ext2/xattr.c | 2 +-
5 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
index a8cbe1b..dc9ee12 100644
--- a/fs/ext2/balloc.c
+++ b/fs/ext2/balloc.c
@@ -165,7 +165,7 @@ static void release_blocks(struct super_block *sb, int count)
struct ext2_sb_info *sbi = EXT2_SB(sb);
percpu_counter_add(&sbi->s_freeblocks_counter, count);
- sb->s_dirt = 1;
+ ext2_mark_super_dirty(sb);
}
}
@@ -180,7 +180,7 @@ static void group_adjust_blocks(struct super_block *sb, int group_no,
free_blocks = le16_to_cpu(desc->bg_free_blocks_count);
desc->bg_free_blocks_count = cpu_to_le16(free_blocks + count);
spin_unlock(sb_bgl_lock(sbi, group_no));
- sb->s_dirt = 1;
+ ext2_mark_super_dirty(sb);
mark_buffer_dirty(bh);
}
}
diff --git a/fs/ext2/ext2.h b/fs/ext2/ext2.h
index 75ad433..4dc8e55 100644
--- a/fs/ext2/ext2.h
+++ b/fs/ext2/ext2.h
@@ -135,6 +135,7 @@ extern long ext2_compat_ioctl(struct file *, unsigned int, unsigned long);
struct dentry *ext2_get_parent(struct dentry *child);
/* super.c */
+extern void ext2_mark_super_dirty(struct super_block *sb);
extern __printf(3, 4)
void ext2_error(struct super_block *, const char *, const char *, ...);
extern __printf(3, 4)
diff --git a/fs/ext2/ialloc.c b/fs/ext2/ialloc.c
index 8b15cf8..9688749 100644
--- a/fs/ext2/ialloc.c
+++ b/fs/ext2/ialloc.c
@@ -81,7 +81,7 @@ static void ext2_release_inode(struct super_block *sb, int group, int dir)
spin_unlock(sb_bgl_lock(EXT2_SB(sb), group));
if (dir)
percpu_counter_dec(&EXT2_SB(sb)->s_dirs_counter);
- sb->s_dirt = 1;
+ ext2_mark_super_dirty(sb);
mark_buffer_dirty(bh);
}
@@ -543,7 +543,7 @@ got:
}
spin_unlock(sb_bgl_lock(sbi, group));
- sb->s_dirt = 1;
+ ext2_mark_super_dirty(sb);
mark_buffer_dirty(bh2);
if (test_opt(sb, GRPID)) {
inode->i_mode = mode;
diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index d141758..134c750 100644
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -1195,6 +1195,11 @@ void ext2_write_super(struct super_block *sb)
sb->s_dirt = 0;
}
+void ext2_mark_super_dirty(struct super_block *sb)
+{
+ sb->s_dirt = 1;
+}
+
static int ext2_remount (struct super_block * sb, int * flags, char * data)
{
struct ext2_sb_info * sbi = EXT2_SB(sb);
diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
index 6dcafc7..a04d280 100644
--- a/fs/ext2/xattr.c
+++ b/fs/ext2/xattr.c
@@ -339,7 +339,7 @@ static void ext2_xattr_update_super_block(struct super_block *sb)
spin_lock(&EXT2_SB(sb)->s_lock);
EXT2_SET_COMPAT_FEATURE(sb, EXT2_FEATURE_COMPAT_EXT_ATTR);
spin_unlock(&EXT2_SB(sb)->s_lock);
- sb->s_dirt = 1;
+ ext2_mark_super_dirty(sb);
mark_buffer_dirty(EXT2_SB(sb)->s_sbh);
}
--
1.7.7.6
next prev parent reply other threads:[~2012-03-21 16:14 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-21 16:14 [PATCH v1 0/8] do not use s_dirt in ext2 Artem Bityutskiy
2012-03-21 16:14 ` [PATCH 1/8] mm: export dirty_writeback_interval Artem Bityutskiy
2012-03-21 16:14 ` [PATCH 2/8] VFS: remove unused superblock helpers Artem Bityutskiy
2012-03-21 16:14 ` [PATCH 3/8] ext2: write superblock only once on unmount Artem Bityutskiy
2012-03-31 11:53 ` Jan Kara
2012-04-02 13:44 ` Artem Bityutskiy
2012-04-02 22:10 ` Jan Kara
2012-03-21 16:14 ` Artem Bityutskiy [this message]
2012-03-21 16:14 ` [PATCH 5/8] ext2: introduce workqueue for superblock synchronization Artem Bityutskiy
2012-03-21 16:14 ` [PATCH 6/8] ext2: stop using VFS for dirty superblock management Artem Bityutskiy
2012-03-21 16:14 ` [PATCH 7/8] ext2: cleanup ext2_sync_super a bit Artem Bityutskiy
2012-03-21 16:14 ` [PATCH 8/8] ext2: introduce own superblock dirty flag Artem Bityutskiy
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=1332346475-1441-5-git-send-email-dedekind1@gmail.com \
--to=dedekind1@gmail.com \
--cc=jack@suse.cz \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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).