tree b6013dafbf461ee6a0ec4f0f554c02e26877b41a
parent 9508534c5f170ada5a745cde0df49732718440e9
author Alex Elder <aelder@sgi.com> 1318968014 +0000
committer Alex Elder <aelder@sgi.com> 1318968014 +0000

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>