All of lore.kernel.org
 help / color / mirror / Atom feed
From: Dave Chinner <david@fromorbit.com>
To: xfs@oss.sgi.com
Subject: [PATCH 12/30] xfs: fix the wrong new_size/rnew_size at xfs_iext_realloc_direct()
Date: Wed, 30 Oct 2013 15:31:03 +1100	[thread overview]
Message-ID: <1383107481-28937-13-git-send-email-david@fromorbit.com> (raw)
In-Reply-To: <1383107481-28937-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

  parent reply	other threads:[~2013-10-30  4:31 UTC|newest]

Thread overview: 76+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-30  4:30 [PATCH 00/30 V3] xfsprogs: CRC write support for xfs_db Dave Chinner
2013-10-30  4:30 ` [PATCH 01/30] xfsprogs: fix automatic dependency generation Dave Chinner
2013-10-31 14:44   ` Christoph Hellwig
2013-10-30  4:30 ` [PATCH 02/30] xfs: fix some minor sparse warnings Dave Chinner
2013-10-31 14:44   ` Christoph Hellwig
2013-10-30  4:30 ` [PATCH 03/30] xfs: create a shared header file for format-related information Dave Chinner
2013-10-31 14:45   ` Christoph Hellwig
2013-10-30  4:30 ` [PATCH 04/30] xfs: split dquot buffer operations out Dave Chinner
2013-10-31 14:45   ` Christoph Hellwig
2013-10-30  4:30 ` [PATCH 05/30] xfs: decouple inode and bmap btree header files Dave Chinner
2013-10-31 14:45   ` Christoph Hellwig
2013-10-30  4:30 ` [PATCH 06/30] libxfs: unify xfs_btree.c with kernel code Dave Chinner
2013-10-31 14:46   ` Christoph Hellwig
2013-10-30  4:30 ` [PATCH 07/30] libxfs: bmap btree owner swap support Dave Chinner
2013-10-31 14:47   ` Christoph Hellwig
2013-10-30  4:30 ` [PATCH 08/30] libxfs: xfs_rtalloc.c becomes xfs_rtbitmap.c Dave Chinner
2013-10-31 14:48   ` Christoph Hellwig
2013-10-30  4:31 ` [PATCH 09/30] libxfs: bring across inode buffer readahead verifier changes Dave Chinner
2013-10-31 14:48   ` Christoph Hellwig
2013-10-30  4:31 ` [PATCH 10/30] libxfs: Minor cleanup and bug fix sync Dave Chinner
2013-10-31 14:48   ` Christoph Hellwig
2013-10-30  4:31 ` [PATCH 11/30] xfs: remove newlines from strings passed to __xfs_printk Dave Chinner
2013-10-31 14:49   ` Christoph Hellwig
2013-10-30  4:31 ` Dave Chinner [this message]
2013-10-31 14:49   ` [PATCH 12/30] xfs: fix the wrong new_size/rnew_size at xfs_iext_realloc_direct() Christoph Hellwig
2013-10-30  4:31 ` [PATCH 13/30] xfs: fix node forward in xfs_node_toosmall Dave Chinner
2013-10-31 14:49   ` Christoph Hellwig
2013-10-30  4:31 ` [PATCH 14/30] xfs: don't emit corruption noise on fs probes Dave Chinner
2013-10-31 14:49   ` Christoph Hellwig
2013-10-30  4:31 ` [PATCH 15/30] db: separate out straight buffer IO from map based IO Dave Chinner
2013-10-31 14:56   ` Christoph Hellwig
2013-10-31 21:50     ` Dave Chinner
2013-11-01 12:51       ` Christoph Hellwig
2013-10-30  4:31 ` [PATCH 16/30] db: rewrite bbmap to use xfs_buf_map Dave Chinner
2013-10-31 15:06   ` Christoph Hellwig
2013-10-30  4:31 ` [PATCH 17/30] db: rewrite IO engine to use libxfs Dave Chinner
2013-10-31 15:10   ` Christoph Hellwig
2013-10-31 21:59     ` Dave Chinner
2013-10-30  4:31 ` [PATCH 18/30] db: introduce verifier support into set_cur Dave Chinner
2013-11-01 13:07   ` Christoph Hellwig
2013-10-30  4:31 ` [PATCH 19/30] db: indicate if the CRC on a buffer is correct or not Dave Chinner
2013-11-01 13:09   ` Christoph Hellwig
2013-10-30  4:31 ` [PATCH 20/30] db: verify and calculate inode CRCs Dave Chinner
2013-11-04  9:05   ` Christoph Hellwig
2013-11-05  0:18     ` Dave Chinner
2013-10-30  4:31 ` [PATCH 21/30] db: verify and calculate dquot CRCs Dave Chinner
2013-11-04  9:06   ` Christoph Hellwig
2013-11-05  0:25     ` Dave Chinner
2013-10-30  4:31 ` [PATCH 22/30] db: add a special directory buffer verifier Dave Chinner
2013-11-04  9:07   ` Christoph Hellwig
2013-10-30  4:31 ` [PATCH 23/30] db: add a special attribute " Dave Chinner
2013-11-04  9:07   ` Christoph Hellwig
2013-10-30  4:31 ` [PATCH 24/30] db: re-enable write support for v5 filesystems Dave Chinner
2013-11-04  9:07   ` Christoph Hellwig
2013-10-30  4:31 ` [PATCH 25/30] libxfs: fix root inode handling inconsistencies Dave Chinner
2013-10-30 10:23   ` Christoph Hellwig
2013-10-30 21:59     ` Dave Chinner
2013-10-31  4:13       ` [PATCH 25/30 V2] " Dave Chinner
2013-10-31 15:00         ` Christoph Hellwig
2013-10-31 22:04           ` Dave Chinner
2013-11-01 13:03             ` Christoph Hellwig
2013-11-04 23:22               ` Dave Chinner
2013-11-05  9:05                 ` Christoph Hellwig
2013-10-30  4:31 ` [PATCH 26/30] xfs_db: avoid libxfs buffer lookup warnings Dave Chinner
2013-11-04  9:12   ` Christoph Hellwig
2013-11-05  0:52     ` Dave Chinner
2013-11-05  9:06       ` Christoph Hellwig
2013-10-30  4:31 ` [PATCH 27/30] libxfs: work around do_div() not handling 32 bit numerators Dave Chinner
2013-11-04  9:16   ` Christoph Hellwig
2013-11-05  1:55     ` Dave Chinner
2013-10-30  4:31 ` [PATCH 28/30] db: enable metadump on CRC filesystems Dave Chinner
2013-11-04  9:18   ` Christoph Hellwig
2013-10-30  4:31 ` [PATCH 29/30] xfs: support larger inode clusters on v5 filesystems Dave Chinner
2013-11-04  9:18   ` Christoph Hellwig
2013-10-30  4:31 ` [PATCH 30/30] xfsprogs: kill experimental warnings for " Dave Chinner
2013-11-04  9:19   ` Christoph Hellwig

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=1383107481-28937-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.