From: Ivan Shapovalov <intelfx100@gmail.com>
To: reiserfs-devel@vger.kernel.org
Cc: edward.shishkin@gmail.com, Ivan Shapovalov <intelfx100@gmail.com>
Subject: [PATCHv2] reiser4: fix an assertion broken since 3.11.
Date: Tue, 6 May 2014 15:18:19 +0400 [thread overview]
Message-ID: <1399375099-6927-1-git-send-email-intelfx100@gmail.com> (raw)
In-Reply-To: <53688D9F.4090101@gmail.com>
reiser4_get_dir_fpos takes an extra argument. It should be safe to pass
dir->f_pos (thus keeping the old behavior exactly).
Signed-off-by: Ivan Shapovalov <intelfx100@gmail.com>
---
OK, got it.
fs/reiser4/plugin/file_ops_readdir.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/fs/reiser4/plugin/file_ops_readdir.c b/fs/reiser4/plugin/file_ops_readdir.c
index 0da5ac5..e359dec 100644
--- a/fs/reiser4/plugin/file_ops_readdir.c
+++ b/fs/reiser4/plugin/file_ops_readdir.c
@@ -59,7 +59,8 @@ adjust_dir_pos(struct file *dir, struct readdir_pos *readdir_spot,
* changes */
readdir_spot->entry_no += adj;
assert("nikita-2577",
- ergo(dir != NULL, reiser4_get_dir_fpos(dir) + adj >= 0));
+ ergo(dir != NULL, reiser4_get_dir_fpos(dir, dir->f_pos) + adj
+ >= 0));
if (de_id_cmp(&pos->dir_entry_key,
&mod_point->dir_entry_key) == EQUAL_TO) {
assert("nikita-2575", mod_point->pos < pos->pos);
--
1.9.2
prev parent reply other threads:[~2014-05-06 11:18 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-05 23:59 [PATCH] reiser4: remove an assertion "nikita-2577" which is no longer possible to check Ivan Shapovalov
2014-05-06 7:22 ` Edward Shishkin
2014-05-06 11:18 ` Ivan Shapovalov [this message]
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=1399375099-6927-1-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).