xfs: put in missed fix for merge problem
authorAlex Elder <aelder@sgi.com>
Tue, 18 Oct 2011 20:00:14 +0000 (20:00 +0000)
committerAlex Elder <aelder@sgi.com>
Tue, 18 Oct 2011 20:00:14 +0000 (20:00 +0000)
commit2900b33999e2fc8a8edf0dddaafffec4da25ee10
treeb6013dafbf461ee6a0ec4f0f554c02e26877b41a
parent9508534c5f170ada5a745cde0df49732718440e9
xfs: put in missed fix for merge problem

I intended to do this as part of fixing part of the conflict with
the merge with Linus' tree, but evidently it didn't get included in
the commit.

Signed-off-by: Alex Elder <aelder@sgi.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
fs/xfs/xfs_trans_ail.c