projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
WorkStruct: make allyesconfig
[deliverable/linux.git]
/
fs
/
reiserfs
/
journal.c
diff --git
a/fs/reiserfs/journal.c
b/fs/reiserfs/journal.c
index 85ce23268302931e0a23a6bd6cc2a20a36581e56..cd1bb75ceb24a459810120bfa361eece65cec42c 100644
(file)
--- a/
fs/reiserfs/journal.c
+++ b/
fs/reiserfs/journal.c
@@
-104,7
+104,7
@@
static int release_journal_dev(struct super_block *super,
struct reiserfs_journal *journal);
static int dirty_one_transaction(struct super_block *s,
struct reiserfs_journal_list *jl);
struct reiserfs_journal *journal);
static int dirty_one_transaction(struct super_block *s,
struct reiserfs_journal_list *jl);
-static void flush_async_commits(
void *p
);
+static void flush_async_commits(
struct work_struct *work
);
static void queue_log_writer(struct super_block *s);
/* values for join in do_journal_begin_r */
static void queue_log_writer(struct super_block *s);
/* values for join in do_journal_begin_r */
@@
-2836,7
+2836,8
@@
int journal_init(struct super_block *p_s_sb, const char *j_dev_name,
if (reiserfs_mounted_fs_count <= 1)
commit_wq = create_workqueue("reiserfs");
if (reiserfs_mounted_fs_count <= 1)
commit_wq = create_workqueue("reiserfs");
- INIT_WORK(&journal->j_work, flush_async_commits, p_s_sb);
+ INIT_DELAYED_WORK(&journal->j_work, flush_async_commits);
+ journal->j_work_sb = p_s_sb;
return 0;
free_and_return:
free_journal_ram(p_s_sb);
return 0;
free_and_return:
free_journal_ram(p_s_sb);
@@
-3447,10
+3448,11
@@
int journal_end_sync(struct reiserfs_transaction_handle *th,
/*
** writeback the pending async commits to disk
*/
/*
** writeback the pending async commits to disk
*/
-static void flush_async_commits(
void *p
)
+static void flush_async_commits(
struct work_struct *work
)
{
{
- struct super_block *p_s_sb = p;
- struct reiserfs_journal *journal = SB_JOURNAL(p_s_sb);
+ struct reiserfs_journal *journal =
+ container_of(work, struct reiserfs_journal, j_work.work);
+ struct super_block *p_s_sb = journal->j_work_sb;
struct reiserfs_journal_list *jl;
struct list_head *entry;
struct reiserfs_journal_list *jl;
struct list_head *entry;
This page took
0.026369 seconds
and
5
git commands to generate.