From: Artem Bityutskiy <dedekind1@gmail.com>
To: Al Viro <viro@ZenIV.linux.org.uk>
Cc: LKML <linux-kernel@vger.kernel.org>,
Jens Axboe <jens.axboe@oracle.com>,
linux-fsdevel@vger.kernel.org,
Evgeniy Dushistov <dushistov@mail.ru>
Subject: [PATCHv4 15/17] UFS: do not manipulate s_dirt directly
Date: Tue, 25 May 2010 16:49:10 +0300 [thread overview]
Message-ID: <1274795352-3551-16-git-send-email-dedekind1@gmail.com> (raw)
In-Reply-To: <1274795352-3551-1-git-send-email-dedekind1@gmail.com>
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 | 12 ++++++------
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/fs/ufs/balloc.c b/fs/ufs/balloc.c
index 5cfa4d8..43e5c4f 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;
@@ -573,7 +573,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);
@@ -702,7 +702,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 3a959d5..765a21d 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_init_owner(inode, dir, mode);
diff --git a/fs/ufs/super.c b/fs/ufs/super.c
index 14743d9..a0317d8 100644
--- a/fs/ufs/super.c
+++ b/fs/ufs/super.c
@@ -288,7 +288,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);
@@ -321,7 +321,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);
@@ -1204,7 +1204,7 @@ static int ufs_sync_fs(struct super_block *sb, int wait)
ufs_set_fs_state(sb, usb1, usb3,
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();
@@ -1218,7 +1218,7 @@ static void ufs_write_super(struct super_block *sb)
if (!(sb->s_flags & MS_RDONLY))
ufs_sync_fs(sb, 1);
else
- sb->s_dirt = 0;
+ mark_sb_clean(sb);
}
static void ufs_put_super(struct super_block *sb)
@@ -1227,7 +1227,7 @@ static void ufs_put_super(struct super_block *sb)
UFSD("ENTER\n");
- if (sb->s_dirt)
+ if (is_sb_dirty(sb))
ufs_write_super(sb);
if (!(sb->s_flags & MS_RDONLY))
@@ -1297,7 +1297,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.6.1
next prev parent reply other threads:[~2010-05-25 13:51 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-25 13:48 [PATCHv4 00/17] kill unnecessary SB sync wake-ups Artem Bityutskiy
2010-05-25 13:48 ` [PATCHv4 01/17] VFS: introduce helpers for the s_dirty flag Artem Bityutskiy
2010-05-28 20:23 ` Andrew Morton
2010-05-28 21:14 ` Al Viro
2010-05-28 21:17 ` Andrew Morton
2010-05-29 8:11 ` Artem Bityutskiy
2010-06-09 15:44 ` tytso
2010-06-09 15:49 ` Artem Bityutskiy
2010-06-09 16:31 ` Andrew Morton
2010-06-09 22:33 ` Al Viro
2010-05-29 7:59 ` Artem Bityutskiy
2010-05-25 13:48 ` [PATCHv4 02/17] AFFS: do not manipulate s_dirt directly Artem Bityutskiy
2010-05-25 13:48 ` [PATCHv4 03/17] BFS: " Artem Bityutskiy
2010-05-25 13:48 ` [PATCHv4 04/17] BTRFS: " Artem Bityutskiy
2010-05-25 13:49 ` [PATCHv4 05/17] EXOFS: " Artem Bityutskiy
2010-05-26 15:12 ` Boaz Harrosh
2010-05-25 13:49 ` [PATCHv4 06/17] EXT2: " Artem Bityutskiy
2010-05-25 13:49 ` [PATCHv4 07/17] EXT4: " Artem Bityutskiy
2010-05-25 13:49 ` [PATCHv4 08/17] FAT: " Artem Bityutskiy
2010-05-25 13:49 ` [PATCHv4 09/17] HFS: " Artem Bityutskiy
2010-05-25 13:49 ` [PATCHv4 10/17] HFSPLUS: " Artem Bityutskiy
2010-05-25 13:49 ` [PATCHv4 11/17] JFFS2: " Artem Bityutskiy
2010-05-25 13:49 ` [PATCHv4 12/17] reiserfs: " Artem Bityutskiy
2010-05-25 13:49 ` [PATCHv4 13/17] SYSV: " Artem Bityutskiy
2010-05-25 13:49 ` [PATCHv4 14/17] UDF: " Artem Bityutskiy
2010-05-25 14:06 ` Jan Kara
2010-05-25 13:49 ` Artem Bityutskiy [this message]
2010-05-25 13:49 ` [PATCHv4 16/17] VFS: rename s_dirt to s_dirty Artem Bityutskiy
2010-05-25 13:49 ` [PATCHv4 17/17] writeback: lessen sync_supers wakeup count Artem Bityutskiy
2010-05-27 6:50 ` Al Viro
2010-05-27 7:22 ` Nick Piggin
2010-05-27 9:08 ` Al Viro
2010-05-27 10:51 ` Artem Bityutskiy
2010-05-27 12:07 ` Nick Piggin
2010-05-27 15:21 ` Artem Bityutskiy
2010-05-27 15:44 ` Nick Piggin
2010-05-27 16:04 ` Artem Bityutskiy
2010-05-31 8:25 ` Artem Bityutskiy
2010-05-31 8:38 ` Nick Piggin
2010-05-31 9:04 ` Artem Bityutskiy
2010-05-31 12:47 ` Nick Piggin
2010-05-31 13:03 ` Artem Bityutskiy
2010-05-27 10:19 ` Artem Bityutskiy
2010-05-31 14:07 ` Artem Bityutskiy
2010-06-04 4:26 ` Al Viro
2010-06-04 5:13 ` Artem Bityutskiy
2010-05-28 20:29 ` Andrew Morton
2010-05-29 8:03 ` 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=1274795352-3551-16-git-send-email-dedekind1@gmail.com \
--to=dedekind1@gmail.com \
--cc=dushistov@mail.ru \
--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
Powered by JetHome