From: Artem Bityutskiy <dedekind@infradead.org>
To: Al Viro <viro@ZenIV.linux.org.uk>
Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
Christoph Hellwig <hch@infradead.org>,
Artem Bityutskiy <Artem.Bityutskiy@nokia.com>,
Roman Zippel <zippel@linux-m68k.org>
Subject: [PATCH v2 02/17] AFFS: do not manipulate s_dirt directly
Date: Thu, 4 Jun 2009 13:41:39 +0300 [thread overview]
Message-ID: <1244112114-23144-3-git-send-email-dedekind@infradead.org> (raw)
In-Reply-To: <1244112114-23144-1-git-send-email-dedekind@infradead.org>
From: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
... use new VFS helpers instead.
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Cc: Roman Zippel <zippel@linux-m68k.org>
---
fs/affs/bitmap.c | 4 ++--
fs/affs/super.c | 12 ++++++++----
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/fs/affs/bitmap.c b/fs/affs/bitmap.c
index dc5ef14..0be510c 100644
--- a/fs/affs/bitmap.c
+++ b/fs/affs/bitmap.c
@@ -102,7 +102,7 @@ affs_free_block(struct super_block *sb, u32 block)
*(__be32 *)bh->b_data = cpu_to_be32(tmp - mask);
mark_buffer_dirty(bh);
- sb->s_dirt = 1;
+ mark_sb_dirty(sb);
bm->bm_free++;
mutex_unlock(&sbi->s_bmlock);
@@ -247,7 +247,7 @@ find_bit:
*(__be32 *)bh->b_data = cpu_to_be32(tmp + mask);
mark_buffer_dirty(bh);
- sb->s_dirt = 1;
+ mark_sb_dirty(sb);
mutex_unlock(&sbi->s_bmlock);
diff --git a/fs/affs/super.c b/fs/affs/super.c
index 280d361..8c105d5 100644
--- a/fs/affs/super.c
+++ b/fs/affs/super.c
@@ -64,9 +64,13 @@ affs_write_super(struct super_block *sb)
&AFFS_ROOT_TAIL(sb, sbi->s_root_bh)->disk_change);
affs_fix_checksum(sb, sbi->s_root_bh);
mark_buffer_dirty(sbi->s_root_bh);
- sb->s_dirt = !clean; /* redo until bitmap synced */
+ /* redo until bitmap synced */
+ if (clean)
+ mark_sb_clean(sb);
+ else
+ mark_sb_dirty(sb);
} else
- sb->s_dirt = 0;
+ mark_sb_clean(sb);
unlock_super(sb);
pr_debug("AFFS: write_super() at %lu, clean=%d\n", get_seconds(), clean);
@@ -522,8 +526,8 @@ affs_remount(struct super_block *sb, int *flags, char *data)
if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
return 0;
if (*flags & MS_RDONLY) {
- sb->s_dirt = 1;
- while (sb->s_dirt)
+ mark_sb_dirty(sb);
+ while (sb_is_dirty(sb))
affs_write_super(sb);
affs_free_bitmap(sb);
} else
--
1.6.0.6
next prev parent reply other threads:[~2009-06-04 8:48 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-04 10:41 [PATCH v2 00/17] abstract out the super block clean/dirty state Artem Bityutskiy
2009-06-04 8:53 ` Artem Bityutskiy
2009-06-04 10:41 ` [PATCH v2 01/17] VFS: introduce helpers for manipulation s_dirty flag Artem Bityutskiy
2009-06-04 19:01 ` Felix Blyakher
2009-06-05 9:01 ` Artem Bityutskiy
2009-06-04 10:41 ` Artem Bityutskiy [this message]
2009-06-04 10:41 ` [PATCH v2 03/17] BFS: do not manipulate s_dirt directly Artem Bityutskiy
2009-06-04 10:41 ` [PATCH v2 04/17] EXOFS: " Artem Bityutskiy
2009-06-04 9:41 ` Boaz Harrosh
2009-06-04 10:41 ` [PATCH v2 05/17] EXT2: " Artem Bityutskiy
2009-06-04 10:41 ` [PATCH v2 06/17] EXT4: " Artem Bityutskiy
2009-06-04 10:41 ` [PATCH v2 07/17] FAT: " Artem Bityutskiy
2009-06-04 10:41 ` [PATCH v2 08/17] HFS: " Artem Bityutskiy
2009-06-04 10:41 ` [PATCH v2 09/17] HFSPLUS: " Artem Bityutskiy
2009-06-04 10:41 ` [PATCH v2 10/17] JFFS2: " Artem Bityutskiy
2009-06-04 10:41 ` [PATCH v2 11/17] NILFS: " Artem Bityutskiy
2009-06-04 10:41 ` [PATCH v2 12/17] reiserfs: " Artem Bityutskiy
2009-06-04 10:41 ` [PATCH v2 13/17] SYSV: " Artem Bityutskiy
2009-06-04 10:41 ` [PATCH v2 14/17] UDF: " Artem Bityutskiy
2009-06-04 10:41 ` [PATCH v2 15/17] UFS: " Artem Bityutskiy
2009-06-04 10:41 ` [PATCH v2 16/17] XFS: " Artem Bityutskiy
2009-06-04 19:00 ` Felix Blyakher
2009-06-04 10:41 ` [PATCH v2 17/17] VFS: use sb_is_dirty helper 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=1244112114-23144-3-git-send-email-dedekind@infradead.org \
--to=dedekind@infradead.org \
--cc=Artem.Bityutskiy@nokia.com \
--cc=hch@infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=viro@ZenIV.linux.org.uk \
--cc=zippel@linux-m68k.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).