public inbox for linux-xfs@vger.kernel.org
 help / color / mirror / Atom feed
From: Dave Chinner <david@fromorbit.com>
To: xfs@oss.sgi.com
Subject: [PATCH 06/17] xfs: xfs_ifree doesn't need to modify the inode buffer
Date: Fri,  7 Jun 2013 15:45:18 +1000	[thread overview]
Message-ID: <1370583929-14276-7-git-send-email-david@fromorbit.com> (raw)
In-Reply-To: <1370583929-14276-1-git-send-email-david@fromorbit.com>

From: Dave Chinner <dchinner@redhat.com>

Long ago, bulkstat used to read inodes directly fromteh backing
buffer for speed. This had the unfortunate problem of being cache
incoherent with unlinks, and so xfs_ifree() had to mark the inode
as free directly in the backing buffer. bulkstat was changed some
time ago to use inode cache coherent lookups, and so will never see
unlinked inodes in it's lookups. Hence xfs_ifree() does not need to
touch the inode backing buffer anymore.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
 fs/xfs/xfs_inode.c |   32 ++++----------------------------
 1 file changed, 4 insertions(+), 28 deletions(-)

diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index d1f76da..9ecfe1e 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -2048,8 +2048,6 @@ xfs_ifree(
 	int			error;
 	int			delete;
 	xfs_ino_t		first_ino;
-	xfs_dinode_t    	*dip;
-	xfs_buf_t       	*ibp;
 
 	ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));
 	ASSERT(ip->i_d.di_nlink == 0);
@@ -2062,14 +2060,13 @@ xfs_ifree(
 	 * Pull the on-disk inode from the AGI unlinked list.
 	 */
 	error = xfs_iunlink_remove(tp, ip);
-	if (error != 0) {
+	if (error)
 		return error;
-	}
 
 	error = xfs_difree(tp, ip->i_ino, flist, &delete, &first_ino);
-	if (error != 0) {
+	if (error)
 		return error;
-	}
+
 	ip->i_d.di_mode = 0;		/* mark incore inode as free */
 	ip->i_d.di_flags = 0;
 	ip->i_d.di_dmevmask = 0;
@@ -2081,31 +2078,10 @@ xfs_ifree(
 	 * by reincarnations of this inode.
 	 */
 	ip->i_d.di_gen++;
-
 	xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
 
-	error = xfs_imap_to_bp(ip->i_mount, tp, &ip->i_imap, &dip, &ibp,
-			       0, 0);
-	if (error)
-		return error;
-
-        /*
-	* Clear the on-disk di_mode. This is to prevent xfs_bulkstat
-	* from picking up this inode when it is reclaimed (its incore state
-	* initialzed but not flushed to disk yet). The in-core di_mode is
-	* already cleared  and a corresponding transaction logged.
-	* The hack here just synchronizes the in-core to on-disk
-	* di_mode value in advance before the actual inode sync to disk.
-	* This is OK because the inode is already unlinked and would never
-	* change its di_mode again for this inode generation.
-	* This is a temporary hack that would require a proper fix
-	* in the future.
-	*/
-	dip->di_mode = 0;
-
-	if (delete) {
+	if (delete)
 		error = xfs_ifree_cluster(ip, tp, first_ino);
-	}
 
 	return error;
 }
-- 
1.7.10.4

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

  parent reply	other threads:[~2013-06-07  5:46 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-07  5:45 [PATCH 00/17] xfs: current patch queue for 3.11 Dave Chinner
2013-06-07  5:45 ` [PATCH 01/17] xfs: update mount options documentation Dave Chinner
2013-06-07  5:45 ` [PATCH 02/17] xfs: add pluging for bulkstat readahead Dave Chinner
2013-06-07  5:45 ` [PATCH 03/17] xfs: plug directory buffer readahead Dave Chinner
2013-06-07  5:45 ` [PATCH 04/17] xfs: don't use speculative prealloc for small files Dave Chinner
2013-06-07  5:45 ` [PATCH 05/17] xfs: don't do IO when creating an new inode Dave Chinner
2013-06-07  5:45 ` Dave Chinner [this message]
2013-06-07  5:45 ` [PATCH 07/17] xfs: Introduce ordered log vector support Dave Chinner
2013-06-07  5:45 ` [PATCH 08/17] xfs: Introduce an ordered buffer item Dave Chinner
2013-06-07  5:45 ` [PATCH 09/17] xfs: Inode create log items Dave Chinner
2013-06-07  5:45 ` [PATCH 10/17] xfs: Inode create transaction reservations Dave Chinner
2013-06-07  5:45 ` [PATCH 11/17] xfs: Inode create item recovery Dave Chinner
2013-06-07  5:45 ` [PATCH 12/17] xfs: Use inode create transaction Dave Chinner
2013-06-07  5:45 ` [PATCH 13/17] xfs: remove local fork format handling from xfs_bmapi_write() Dave Chinner
2013-06-07  5:45 ` [PATCH 14/17] xfs: move getdents code into it's own file Dave Chinner
2013-06-07  5:45 ` [PATCH 15/17] xfs: reshuffle dir2 definitions around for userspace Dave Chinner
2013-06-07  5:45 ` [PATCH 16/17] xfs: split out attribute listing code into separate file Dave Chinner
2013-06-07  5:45 ` [PATCH 17/17] xfs: split out attribute fork truncation " 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=1370583929-14276-7-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