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>,
Evgeniy Dushistov <dushistov@mail.ru>
Subject: [PATCH v2 15/17] UFS: do not manipulate s_dirt directly
Date: Thu, 4 Jun 2009 13:41:52 +0300 [thread overview]
Message-ID: <1244112114-23144-16-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: Evgeniy Dushistov <dushistov@mail.ru>
---
fs/ufs/balloc.c | 8 ++++----
fs/ufs/ialloc.c | 4 ++--
fs/ufs/super.c | 10 +++++-----
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/fs/ufs/balloc.c b/fs/ufs/balloc.c
index 54c16ec..71a6971 100644
--- a/fs/ufs/balloc.c
+++ b/fs/ufs/balloc.c
@@ -122,7 +122,7 @@ void ufs_free_fragments(struct inode *inode, u64 fragment, unsigned count)
ubh_ll_rw_block(SWRITE, UCPI_UBH(ucpi));
ubh_wait_on_buffer (UCPI_UBH(ucpi));
}
- sb->s_dirt = 1;
+ mark_sb_dirty(sb);
unlock_super (sb);
UFSD("EXIT\n");
@@ -223,7 +223,7 @@ do_more:
goto do_more;
}
- sb->s_dirt = 1;
+ mark_sb_dirty(sb);
unlock_super (sb);
UFSD("EXIT\n");
return;
@@ -571,7 +571,7 @@ static u64 ufs_add_fragments(struct inode *inode, u64 fragment,
ubh_ll_rw_block(SWRITE, UCPI_UBH(ucpi));
ubh_wait_on_buffer (UCPI_UBH(ucpi));
}
- sb->s_dirt = 1;
+ mark_sb_dirty(sb);
UFSD("EXIT, fragment %llu\n", (unsigned long long)fragment);
@@ -698,7 +698,7 @@ succed:
ubh_ll_rw_block(SWRITE, UCPI_UBH(ucpi));
ubh_wait_on_buffer (UCPI_UBH(ucpi));
}
- sb->s_dirt = 1;
+ mark_sb_dirty(sb);
result += cgno * uspi->s_fpg;
UFSD("EXIT3, result %llu\n", (unsigned long long)result);
diff --git a/fs/ufs/ialloc.c b/fs/ufs/ialloc.c
index 3527c00..b33cfe6 100644
--- a/fs/ufs/ialloc.c
+++ b/fs/ufs/ialloc.c
@@ -124,7 +124,7 @@ void ufs_free_inode (struct inode * inode)
ubh_wait_on_buffer (UCPI_UBH(ucpi));
}
- sb->s_dirt = 1;
+ mark_sb_dirty(sb);
unlock_super (sb);
UFSD("EXIT\n");
}
@@ -300,7 +300,7 @@ cg_found:
ubh_ll_rw_block(SWRITE, UCPI_UBH(ucpi));
ubh_wait_on_buffer (UCPI_UBH(ucpi));
}
- sb->s_dirt = 1;
+ mark_sb_dirty(sb);
inode->i_ino = cg * uspi->s_ipg + bit;
inode->i_mode = mode;
diff --git a/fs/ufs/super.c b/fs/ufs/super.c
index c97210e..0316f83 100644
--- a/fs/ufs/super.c
+++ b/fs/ufs/super.c
@@ -237,7 +237,7 @@ void ufs_error (struct super_block * sb, const char * function,
if (!(sb->s_flags & MS_RDONLY)) {
usb1->fs_clean = UFS_FSBAD;
ubh_mark_buffer_dirty(USPI_UBH(uspi));
- sb->s_dirt = 1;
+ mark_sb_dirty(sb);
sb->s_flags |= MS_RDONLY;
}
va_start (args, fmt);
@@ -269,7 +269,7 @@ void ufs_panic (struct super_block * sb, const char * function,
if (!(sb->s_flags & MS_RDONLY)) {
usb1->fs_clean = UFS_FSBAD;
ubh_mark_buffer_dirty(USPI_UBH(uspi));
- sb->s_dirt = 1;
+ mark_sb_dirty(sb);
}
va_start (args, fmt);
vsnprintf (error_buf, sizeof(error_buf), fmt, args);
@@ -1148,7 +1148,7 @@ static void ufs_write_super(struct super_block *sb)
UFS_FSOK - fs32_to_cpu(sb, usb1->fs_time));
ufs_put_cstotal(sb);
}
- sb->s_dirt = 0;
+ mark_sb_clean(sb);
UFSD("EXIT\n");
unlock_kernel();
unlock_super(sb);
@@ -1160,7 +1160,7 @@ static void ufs_put_super(struct super_block *sb)
UFSD("ENTER\n");
- if (sb->s_dirt)
+ if (sb_is_dirty(sb))
ufs_write_super(sb);
if (!(sb->s_flags & MS_RDONLY))
@@ -1226,7 +1226,7 @@ static int ufs_remount (struct super_block *sb, int *mount_flags, char *data)
ufs_set_fs_state(sb, usb1, usb3,
UFS_FSOK - fs32_to_cpu(sb, usb1->fs_time));
ubh_mark_buffer_dirty (USPI_UBH(uspi));
- sb->s_dirt = 0;
+ mark_sb_clean(sb);
sb->s_flags |= MS_RDONLY;
} else {
/*
--
1.6.0.6
next prev parent reply other threads:[~2009-06-04 8:49 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 ` [PATCH v2 02/17] AFFS: do not manipulate s_dirt directly Artem Bityutskiy
2009-06-04 10:41 ` [PATCH v2 03/17] BFS: " 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 ` Artem Bityutskiy [this message]
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-16-git-send-email-dedekind@infradead.org \
--to=dedekind@infradead.org \
--cc=Artem.Bityutskiy@nokia.com \
--cc=dushistov@mail.ru \
--cc=hch@infradead.org \
--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).