From: Dave Chinner <david@fromorbit.com>
To: xfs@oss.sgi.com
Subject: [PATCH 12/37] xfs: fix the wrong new_size/rnew_size at xfs_iext_realloc_direct()
Date: Wed, 6 Nov 2013 12:06:58 +1100 [thread overview]
Message-ID: <1383700043-32305-13-git-send-email-david@fromorbit.com> (raw)
In-Reply-To: <1383700043-32305-1-git-send-email-david@fromorbit.com>
From: Dave Chinner <dchinner@redhat.com>
At xfs_iext_realloc_direct(), the new_size is changed by adding
if_bytes if originally the extent records are stored at the inline
extent buffer, and we have to switch from it to a direct extent
list for those new allocated extents, this is wrong.
This patch fix above problem and revise the new_size comments at
xfs_iext_realloc_direct() to make it more readable. Also, fix the
comments while switching from the inline extent buffer to a direct
extent list to reflect this change.
Ported from kernel commit 17ec81c1.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
libxfs/xfs_inode_fork.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/libxfs/xfs_inode_fork.c b/libxfs/xfs_inode_fork.c
index 190690c..dfa86ae 100644
--- a/libxfs/xfs_inode_fork.c
+++ b/libxfs/xfs_inode_fork.c
@@ -1330,7 +1330,7 @@ xfs_iext_remove_indirect(
void
xfs_iext_realloc_direct(
xfs_ifork_t *ifp, /* inode fork pointer */
- int new_size) /* new size of extents */
+ int new_size) /* new size of extents after adding */
{
int rnew_size; /* real new size of extents */
@@ -1368,13 +1368,8 @@ xfs_iext_realloc_direct(
rnew_size - ifp->if_real_bytes);
}
}
- /*
- * Switch from the inline extent buffer to a direct
- * extent list. Be sure to include the inline extent
- * bytes in new_size.
- */
+ /* Switch from the inline extent buffer to a direct extent list */
else {
- new_size += ifp->if_bytes;
if (!is_power_of_2(new_size)) {
rnew_size = roundup_pow_of_two(new_size);
}
--
1.8.4.rc3
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2013-11-06 1:07 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-06 1:06 [PATCH 00/37 V4] xfsprogs: CRC write support for xfs_db + more Dave Chinner
2013-11-06 1:06 ` [PATCH 01/37] xfsprogs: fix automatic dependency generation Dave Chinner
2013-11-06 1:06 ` [PATCH 02/37] xfs: fix some minor sparse warnings Dave Chinner
2013-11-06 1:06 ` [PATCH 03/37] xfs: create a shared header file for format-related information Dave Chinner
2013-11-06 1:06 ` [PATCH 04/37] xfs: split dquot buffer operations out Dave Chinner
2013-11-06 1:06 ` [PATCH 05/37] xfs: decouple inode and bmap btree header files Dave Chinner
2013-11-06 1:06 ` [PATCH 06/37] libxfs: unify xfs_btree.c with kernel code Dave Chinner
2013-11-06 1:06 ` [PATCH 07/37] libxfs: bmap btree owner swap support Dave Chinner
2013-11-06 1:06 ` [PATCH 08/37] libxfs: xfs_rtalloc.c becomes xfs_rtbitmap.c Dave Chinner
2013-11-06 1:06 ` [PATCH 09/37] libxfs: bring across inode buffer readahead verifier changes Dave Chinner
2013-11-06 1:06 ` [PATCH 10/37] libxfs: Minor cleanup and bug fix sync Dave Chinner
2013-11-06 1:06 ` [PATCH 11/37] xfs: remove newlines from strings passed to __xfs_printk Dave Chinner
2013-11-06 1:06 ` Dave Chinner [this message]
2013-11-06 1:06 ` [PATCH 13/37] xfs: fix node forward in xfs_node_toosmall Dave Chinner
2013-11-06 1:07 ` [PATCH 14/37] xfs: don't emit corruption noise on fs probes Dave Chinner
2013-11-06 1:07 ` [PATCH 15/37] libxfs: fix root inode handling inconsistencies Dave Chinner
2013-11-06 10:23 ` Christoph Hellwig
2013-11-06 23:02 ` [PATCH 15/37 V2] " Dave Chinner
2013-11-07 4:58 ` [PATCH 15/37 V3] " Dave Chinner
2013-11-07 8:11 ` Christoph Hellwig
2013-11-06 1:07 ` [PATCH 16/37] libxfs: stop caching inode structures Dave Chinner
2013-11-06 1:07 ` [PATCH 17/37] db: separate out straight buffer IO from map based IO Dave Chinner
2013-11-07 20:50 ` Christoph Hellwig
2013-11-06 1:07 ` [PATCH 18/37] db: rewrite bbmap to use xfs_buf_map Dave Chinner
2013-11-06 1:07 ` [PATCH 19/37] libxfs: refactor libxfs_buf_read_map for xfs_db Dave Chinner
2013-11-07 20:51 ` Christoph Hellwig
2013-11-06 1:07 ` [PATCH 20/37] db: rewrite IO engine to use libxfs Dave Chinner
2013-11-06 1:07 ` [PATCH 21/37] db: introduce verifier support into set_cur Dave Chinner
2013-11-06 1:07 ` [PATCH 22/37] db: indicate if the CRC on a buffer is correct or not Dave Chinner
2013-11-06 1:07 ` [PATCH 23/37] db: verify and calculate inode CRCs Dave Chinner
2013-11-06 1:07 ` [PATCH 24/37] db: verify and calculate dquot CRCs Dave Chinner
2013-11-06 1:07 ` [PATCH 25/37] db: add a special directory buffer verifier Dave Chinner
2013-11-06 1:07 ` [PATCH 26/37] db: add a special attribute " Dave Chinner
2013-11-06 1:07 ` [PATCH 27/37] db: re-enable write support for v5 filesystems Dave Chinner
2013-11-06 1:07 ` [PATCH 28/37] xfs_db: avoid libxfs buffer lookup warnings Dave Chinner
2013-11-06 2:20 ` Dave Chinner
2013-11-07 20:52 ` Christoph Hellwig
2013-11-06 1:07 ` [PATCH 29/37] " Dave Chinner
2013-11-07 20:54 ` Christoph Hellwig
2013-11-06 1:07 ` [PATCH 30/37] libxfs: work around do_div() not handling 32 bit numerators Dave Chinner
2013-11-07 20:54 ` Christoph Hellwig
2013-11-06 1:07 ` [PATCH 31/37] db: Unwind the IO stack on exit Dave Chinner
2013-11-07 20:55 ` Christoph Hellwig
2013-11-06 1:07 ` [PATCH 32/37] db: enable metadump on CRC filesystems Dave Chinner
2013-11-06 1:07 ` [PATCH 33/37] xfs: support larger inode clusters on v5 filesystems Dave Chinner
2013-11-06 1:07 ` [PATCH 34/37] xfsprogs: kill experimental warnings for " Dave Chinner
2013-11-06 1:07 ` [PATCH 35/37] repair: prefetching is turned off unnecessarily Dave Chinner
2013-11-06 10:45 ` Christoph Hellwig
2013-11-06 1:07 ` [PATCH 36/37] repair: Increase default repair parallelism on large filesystems Dave Chinner
2013-11-06 10:41 ` Christoph Hellwig
2013-11-06 19:13 ` Dave Chinner
2013-11-12 23:38 ` Dave Chinner
2013-11-13 7:55 ` Christoph Hellwig
2013-11-06 1:07 ` [PATCH 37/37] repair: fix leaf node directory data check Dave Chinner
2013-11-06 10:39 ` Christoph Hellwig
2013-11-06 10:19 ` [PATCH 00/37 V4] xfsprogs: CRC write support for xfs_db + more Christoph Hellwig
2013-11-06 19:15 ` Dave Chinner
2013-11-10 1:05 ` Rich Johnston
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=1383700043-32305-13-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