From 9763835f7fef98b096380d5a9c3c0f0a31088556 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Sat, 18 Jul 2009 18:14:59 -0400 Subject: [PATCH] --- yaml --- r: 156677 b: refs/heads/master c: 10746e47e722b5688fcd6eba9fbf9b2e64a248a7 h: refs/heads/master i: 156675: 720e74dcbe9c42ce82ec41e38666536837d458f0 v: v3 --- [refs] | 2 +- trunk/fs/xfs/xfs_attr.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5d961e470b6b..49474d3489cf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 36fae17a648e0aee5d9560514d08477ef48dc87f +refs/heads/master: 10746e47e722b5688fcd6eba9fbf9b2e64a248a7 diff --git a/trunk/fs/xfs/xfs_attr.c b/trunk/fs/xfs/xfs_attr.c index db15feb906ff..bfb583791fe2 100644 --- a/trunk/fs/xfs/xfs_attr.c +++ b/trunk/fs/xfs/xfs_attr.c @@ -2141,8 +2141,8 @@ xfs_attr_rmtval_set(xfs_da_args_t *args) dblkno = XFS_FSB_TO_DADDR(mp, map.br_startblock), blkcnt = XFS_FSB_TO_BB(mp, map.br_blockcount); - bp = xfs_buf_get_flags(mp->m_ddev_targp, dblkno, - blkcnt, XFS_BUF_LOCK); + bp = xfs_buf_get_flags(mp->m_ddev_targp, dblkno, blkcnt, + XFS_BUF_LOCK | XBF_DONT_BLOCK); ASSERT(bp); ASSERT(!XFS_BUF_GETERROR(bp));