From: Ivan Shapovalov <intelfx100@gmail.com>
To: reiserfs-devel@vger.kernel.org
Cc: edward.shishkin@gmail.com, Ivan Shapovalov <intelfx100@gmail.com>
Subject: [PATCHv2 1/3] reiser4: fix reiser4_post_{commit,write_back}_hook() and their invocations.
Date: Mon, 21 Jul 2014 22:19:29 +0400 [thread overview]
Message-ID: <1405966771-12575-2-git-send-email-intelfx100@gmail.com> (raw)
In-Reply-To: <1405966771-12575-1-git-send-email-intelfx100@gmail.com>
- let all hooks be called from one place (reiser4_write_logs())
- don't call reiser4_post_write_back_hook() twice
- fix reiser4_post_write_back_hook(): call the correct method of space allocator
Signed-off-by: Ivan Shapovalov <intelfx100@gmail.com>
---
fs/reiser4/block_alloc.c | 2 +-
fs/reiser4/wander.c | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/fs/reiser4/block_alloc.c b/fs/reiser4/block_alloc.c
index 81ed96f..3a4b667 100644
--- a/fs/reiser4/block_alloc.c
+++ b/fs/reiser4/block_alloc.c
@@ -1150,7 +1150,7 @@ void reiser4_post_write_back_hook(void)
{
assert("zam-504", get_current_super_private() != NULL);
- sa_post_commit_hook();
+ sa_post_write_back_hook();
}
/*
diff --git a/fs/reiser4/wander.c b/fs/reiser4/wander.c
index 0b518c3..4e29de8 100644
--- a/fs/reiser4/wander.c
+++ b/fs/reiser4/wander.c
@@ -1140,7 +1140,6 @@ static int write_tx_back(struct commit_handle * ch)
int ret;
int barrier;
- reiser4_post_commit_hook();
fq = get_fq_for_current_atom();
if (IS_ERR(fq))
return PTR_ERR(fq);
@@ -1165,7 +1164,6 @@ static int write_tx_back(struct commit_handle * ch)
if (ret)
return ret;
}
- reiser4_post_write_back_hook();
return 0;
}
@@ -1251,6 +1249,7 @@ int reiser4_write_logs(long *nr_submitted)
spin_lock_atom(atom);
reiser4_atom_set_stage(atom, ASTAGE_POST_COMMIT);
spin_unlock_atom(atom);
+ reiser4_post_commit_hook();
ret = write_tx_back(&ch);
reiser4_post_write_back_hook();
--
2.0.2
next prev parent reply other threads:[~2014-07-21 18:19 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-21 18:19 [PATCHv2 0/3] reiser4: discard support: perform discard before all deallocations Ivan Shapovalov
2014-07-21 18:19 ` Ivan Shapovalov [this message]
2014-07-21 18:19 ` [PATCHv2 2/3] reiser4: discard support: use reiser4_post_write_back_hook() for discarding and completing deferred deallocations Ivan Shapovalov
2014-07-21 18:19 ` [PATCHv2 3/3] reiser4: discard support: perform discard before all deallocations Ivan Shapovalov
2014-07-28 11:46 ` [PATCHv2 0/3] " Edward Shishkin
2014-07-29 9:29 ` Ivan Shapovalov
2014-07-31 21:29 ` Edward Shishkin
2014-07-31 22:06 ` Ivan Shapovalov
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=1405966771-12575-2-git-send-email-intelfx100@gmail.com \
--to=intelfx100@gmail.com \
--cc=edward.shishkin@gmail.com \
--cc=reiserfs-devel@vger.kernel.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).