From: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
To: Al Viro <viro@ZenIV.linux.org.uk>, Jens Axboe <jens.axboe@oracle.com>
Cc: linux-fsdevel@vger.kernel.org,
Artem Bityutskiy <Artem.Bityutskiy@nokia.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH v3 12/18] reiserfs: do not manipulate s_dirt directly
Date: Thu, 09 Jul 2009 11:49:46 +0300 [thread overview]
Message-ID: <20090709084946.12122.55544.sendpatchset@localhost.localdomain> (raw)
In-Reply-To: <20090709084822.12122.79749.sendpatchset@localhost.localdomain>
... use new VFS helpers instead.
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
---
fs/reiserfs/journal.c | 6 +++---
fs/reiserfs/resize.c | 2 +-
fs/reiserfs/super.c | 10 +++++-----
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c
index 77f5bb7..1197c30 100644
--- a/fs/reiserfs/journal.c
+++ b/fs/reiserfs/journal.c
@@ -3259,7 +3259,7 @@ int journal_mark_dirty(struct reiserfs_transaction_handle *th,
th->t_trans_id, journal->j_trans_id);
}
- sb->s_dirt = 1;
+ mark_sb_dirty(sb);
prepared = test_clear_buffer_journal_prepared(bh);
clear_buffer_journal_restore_dirty(bh);
@@ -3554,7 +3554,7 @@ int reiserfs_flush_old_commits(struct super_block *sb)
do_journal_end(&th, sb, 1, COMMIT_NOW | WAIT);
}
}
- return sb->s_dirt;
+ return is_sb_dirty(sb);
}
/*
@@ -3984,7 +3984,7 @@ static int do_journal_end(struct reiserfs_transaction_handle *th,
** it tells us if we should continue with the journal_end, or just return
*/
if (!check_journal_end(th, sb, nblocks, flags)) {
- sb->s_dirt = 1;
+ mark_sb_dirty(sb);
wake_queued_writers(sb);
reiserfs_async_progress_wait(sb);
goto out;
diff --git a/fs/reiserfs/resize.c b/fs/reiserfs/resize.c
index 18b315d..265bed0 100644
--- a/fs/reiserfs/resize.c
+++ b/fs/reiserfs/resize.c
@@ -201,7 +201,7 @@ int reiserfs_resize(struct super_block *s, unsigned long block_count_new)
(bmap_nr_new - bmap_nr)));
PUT_SB_BLOCK_COUNT(s, block_count_new);
PUT_SB_BMAP_NR(s, bmap_would_wrap(bmap_nr_new) ? : bmap_nr_new);
- s->s_dirt = 1;
+ mark_sb_dirty(s);
journal_mark_dirty(&th, s, SB_BUFFER_WITH_SB(s));
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index d3aeb06..a026cad 100644
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -71,8 +71,8 @@ static int reiserfs_sync_fs(struct super_block *s, int wait)
if (!journal_begin(&th, s, 1))
if (!journal_end_sync(&th, s, 1))
reiserfs_flush_old_commits(s);
- s->s_dirt = 0; /* Even if it's not true.
- * We'll loop forever in sync_supers otherwise */
+ mark_sb_clean(s); /* Even if it's not true.
+ * We'll loop forever in sync_supers otherwise */
reiserfs_write_unlock(s);
return 0;
}
@@ -98,7 +98,7 @@ static int reiserfs_freeze(struct super_block *s)
journal_end_sync(&th, s, 1);
}
}
- s->s_dirt = 0;
+ mark_sb_clean(s);
reiserfs_write_unlock(s);
return 0;
}
@@ -468,7 +468,7 @@ static void reiserfs_put_super(struct super_block *s)
lock_kernel();
- if (s->s_dirt)
+ if (is_sb_dirty(s))
reiserfs_write_super(s);
/* change file system state to current state if it was mounted with read-write permissions */
@@ -1287,7 +1287,7 @@ static int reiserfs_remount(struct super_block *s, int *mount_flags, char *arg)
err = journal_end(&th, s, 10);
if (err)
goto out_err;
- s->s_dirt = 0;
+ mark_sb_clean(s);
if (!(*mount_flags & MS_RDONLY)) {
finish_unfinished(s);
--
1.6.0.6
next prev parent reply other threads:[~2009-07-09 6:59 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-09 8:48 [PATCH v3 00/18] periodic write-back timer optimization Artem Bityutskiy
2009-07-09 8:48 ` [PATCH v3 01/18] VFS: introduce helpers for manipulation s_dirty flag Artem Bityutskiy
2009-07-09 8:48 ` [PATCH v3 02/18] AFFS: do not manipulate s_dirt directly Artem Bityutskiy
2009-07-09 8:48 ` [PATCH v3 03/18] BFS: " Artem Bityutskiy
2009-07-09 8:48 ` [PATCH v3 04/18] EXOFS: " Artem Bityutskiy
2009-07-12 9:53 ` Boaz Harrosh
2009-07-12 14:02 ` Artem Bityutskiy
2009-07-09 8:48 ` [PATCH v3 05/18] EXT2: " Artem Bityutskiy
2009-07-09 8:49 ` [PATCH v3 06/18] EXT4: " Artem Bityutskiy
2009-07-09 8:49 ` [PATCH v3 07/18] FAT: " Artem Bityutskiy
2009-07-09 8:49 ` [PATCH v3 08/18] HFS: " Artem Bityutskiy
2009-07-09 8:49 ` [PATCH v3 09/18] HFSPLUS: " Artem Bityutskiy
2009-07-09 8:49 ` [PATCH v3 10/18] JFFS2: " Artem Bityutskiy
2009-07-09 8:49 ` [PATCH v3 11/18] NILFS: " Artem Bityutskiy
2009-07-09 8:49 ` Artem Bityutskiy [this message]
2009-07-09 8:49 ` [PATCH v3 13/18] SYSV: " Artem Bityutskiy
2009-07-09 8:49 ` [PATCH v3 14/18] UDF: " Artem Bityutskiy
2009-07-09 8:50 ` [PATCH v3 15/18] UFS: " Artem Bityutskiy
2009-07-09 8:50 ` [PATCH v3 16/18] VFS: use is_sb_dirty helper Artem Bityutskiy
2009-07-09 8:50 ` [PATCH v3 17/18] rename s_dirt to s_dirty Artem Bityutskiy
2009-07-09 8:50 ` [PATCH v3 18/18] writeback: optimize periodic sync_supers Artem Bityutskiy
2009-07-09 12:37 ` [PATCH v3 00/18] periodic write-back timer optimization Andi Kleen
2009-07-09 13:04 ` Artem Bityutskiy
2009-07-15 6:21 ` Artem Bityutskiy
2009-07-24 15:45 ` Artem Bityutskiy
2009-09-14 15:27 ` 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=20090709084946.12122.55544.sendpatchset@localhost.localdomain \
--to=artem.bityutskiy@nokia.com \
--cc=jens.axboe@oracle.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=viro@ZenIV.linux.org.uk \
/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).