From b75286059097342cad59b453533e4858b331a7bc Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Sat, 18 Jul 2009 18:15:00 -0400 Subject: [PATCH] --- yaml --- r: 162761 b: refs/heads/master c: 5a25f1abb26f5ab7c6c72fe0b3807c137ee484bb h: refs/heads/master i: 162759: 1912f3dd93fcc5547b76f3257198a1cbb73e367b v: v3 --- [refs] | 2 +- trunk/fs/xfs/xfs_vnodeops.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9c801bca6b26..d613ca84271a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f56ebd66df411446030e2cc820554c6ce4ba0836 +refs/heads/master: 5a25f1abb26f5ab7c6c72fe0b3807c137ee484bb diff --git a/trunk/fs/xfs/xfs_vnodeops.c b/trunk/fs/xfs/xfs_vnodeops.c index 1dd706887156..ceecafd1f9c1 100644 --- a/trunk/fs/xfs/xfs_vnodeops.c +++ b/trunk/fs/xfs/xfs_vnodeops.c @@ -538,7 +538,9 @@ xfs_readlink_bmap( d = XFS_FSB_TO_DADDR(mp, mval[n].br_startblock); byte_cnt = XFS_FSB_TO_B(mp, mval[n].br_blockcount); - bp = xfs_buf_read(mp->m_ddev_targp, d, BTOBB(byte_cnt), 0); + bp = xfs_buf_read_flags(mp->m_ddev_targp, d, BTOBB(byte_cnt), + XBF_LOCK | XBF_MAPPED | + XBF_DONT_BLOCK); error = XFS_BUF_GETERROR(bp); if (error) { xfs_ioerror_alert("xfs_readlink",