On Wed, May 09, 2018 at 10:24:28AM +1000, Dave Chinner wrote: > On Tue, May 08, 2018 at 10:18:11AM -0400, Brian Foster wrote: > > On Tue, May 08, 2018 at 01:41:58PM +1000, Dave Chinner wrote: > > > From: Dave Chinner <dchinner@xxxxxxxxxx> > > > > > > xfs_inactive_symlink_rmt() does something nasty - it joins an inode > > > into a transaction it is already joined to. This means the inode can > > > have multiple log item descriptors attached to the transaction for > > > it. This breaks teh 1:1 mapping that is supposed to exist > > > between the log item and log item descriptor. > > > > > > This results in the log item being processed twice during > > > transaction commit and CIL formatting, and there are lots of other > > > potential issues tha arise from double processing of log items in > > > the transaction commit state machine. > > > > > > In this case, the inode is already held by the rolling transaction > > > returned from xfs_defer_finish(), so there's no need to join it > > > again. > > > > > > Signed-Off-By: Dave Chinner <dchinner@xxxxxxxxxx> > > > Reviewed-by: Christoph Hellwig <hch@xxxxxx> > > > --- > > > fs/xfs/xfs_symlink.c | 9 ++------- > > > 1 file changed, 2 insertions(+), 7 deletions(-) > > > > > > diff --git a/fs/xfs/xfs_symlink.c b/fs/xfs/xfs_symlink.c > > > index 5b66ac12913c..27870e5cd259 100644 > > > --- a/fs/xfs/xfs_symlink.c > > > +++ b/fs/xfs/xfs_symlink.c > > > @@ -488,16 +488,11 @@ xfs_inactive_symlink_rmt( > > > error = xfs_defer_finish(&tp, &dfops); > > > if (error) > > > goto error_bmap_cancel; > > > - /* > > > - * The first xact was committed, so add the inode to the new one. > > > - * Mark it dirty so it will be logged and moved forward in the log as > > > - * part of every commit. > > > - */ > > > - xfs_trans_ijoin(tp, ip, 0); > > > - xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); > > > + > > > /* > > > * Commit the transaction containing extent freeing and EFDs. > > > */ > > > + xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); > > > > Seems fine.. but do we even need this call? We're about to commit the > > transaction and unlock the inode... > > Yes, I think we do. We need it to be committed in each of the > rolling transactions so that the inode doesn't get written/replayed > before any of the other dependent metadata changes in this final > transaction. > Hmm, I don't follow what that means. IIUC the act of logging it again simply moves it forward in the log. That makes sense down in the dfops code but seems unecessary here given that we are about to complete the chain of transactions. xfs_inactive_symlink_rmt() makes changes to the inode, invals/unmaps the remote bufs, joins the inode to the dfops and finishes the dfops. We return from xfs_defer_finish() having committed the (still locked) inode modifications and have a new/rolled transaction that covers the free of the associated blocks (EFDs). I could certainly be missing something, but from that point what difference does it make whether the final transaction relogs the inode before it commits? The in-core inode is still locked and the previous inode modifications may very well already be in the on-disk log. That said, it seems harmless despite not understanding what it's for. So with or without the xfs_trans_log_inode() call: Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx> > Cheers, > > Dave. > -- > Dave Chinner > david@xxxxxxxxxxxxx > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
