From: Dave Chinner <david@fromorbit.com>
To: xfs@oss.sgi.com
Subject: [PATCH] xfs_io: fix fiemap loop continuation
Date: Thu, 2 Feb 2012 17:21:14 +1100 [thread overview]
Message-ID: <1328163674-9420-1-git-send-email-david@fromorbit.com> (raw)
From: Dave Chinner <dchinner@redhat.com>
From: Dave Chinner <dchinner@redhat.com>
When the fiemap command needs to retrieve more extents from the
kernel via a subsequent IO, it calculates the next logical block to
retrieve in file system block units. the fiemap needs the start
offset in bytes, not filesystem blocks. Hence if the fiemap command
can loop forever retrieving the same blocks if the logical offset
offset of the next block in filesystem block units is smaller than
the number of bytes in a filessytem block. i.e. it will just loop
retreiving the first 32 extents from offset block zero.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
io/fiemap.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/io/fiemap.c b/io/fiemap.c
index 066e693..99296dd 100644
--- a/io/fiemap.c
+++ b/io/fiemap.c
@@ -108,7 +108,7 @@ print_verbose(
boff_w, bbuf, tot_w, len, flg_w, flgbuf);
(*cur_extent)++;
- *last_logical = lstart + len;
+ *last_logical = extent->fe_logical + extent->fe_length;
}
static void
@@ -151,7 +151,7 @@ print_plain(
else
printf("\n");
(*cur_extent)++;
- *last_logical = lstart + len;
+ *last_logical = extent->fe_logical + extent->fe_length;
}
int
@@ -252,7 +252,7 @@ fiemap_f(
memset(fiemap, 0, map_size);
fiemap->fm_flags = fiemap_flags;
fiemap->fm_start = last_logical;
- fiemap->fm_length = -1;
+ fiemap->fm_length = -1LL;
fiemap->fm_extent_count = num_extents;
ret = ioctl(file->fd, FS_IOC_FIEMAP, (unsigned long)fiemap);
--
1.7.8.3
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next reply other threads:[~2012-02-02 6:21 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-02 6:21 Dave Chinner [this message]
2012-02-02 9:13 ` [PATCH] xfs_io: fix fiemap loop continuation Christoph Hellwig
2012-02-13 19:09 ` Christoph Hellwig
2012-02-14 0:45 ` [PATCH V2] " Dave Chinner
2012-02-14 0:48 ` Christoph Hellwig
2012-02-14 1:00 ` Dave Chinner
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=1328163674-9420-1-git-send-email-david@fromorbit.com \
--to=david@fromorbit.com \
--cc=xfs@oss.sgi.com \
/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