git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
fs
/
xfs
/
xfs_attr.c
diff --git
a/fs/xfs/xfs_attr.c
b/fs/xfs/xfs_attr.c
index
8eb321e
..
f1ccb58
100644
(file)
--- a/
fs/xfs/xfs_attr.c
+++ b/
fs/xfs/xfs_attr.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2000-200
3
Silicon Graphics, Inc. All Rights Reserved.
+ * Copyright (c) 2000-200
4
Silicon Graphics, Inc. All Rights Reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of version 2 of the GNU General Public License as
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of version 2 of the GNU General Public License as
@@
-2149,8
+2149,8
@@
xfs_attr_rmtval_remove(xfs_da_args_t *args)
/*
* If the "remote" value is in the cache, remove it.
*/
/*
* If the "remote" value is in the cache, remove it.
*/
- /* bp = incore(mp->m_dev, dblkno, blkcnt, 1); */
-
bp = xfs_incore(mp->m_ddev_targp, dblkno, blkcnt, 1
);
+ bp = xfs_incore(mp->m_ddev_targp, dblkno, blkcnt,
+
XFS_INCORE_TRYLOCK
);
if (bp) {
XFS_BUF_STALE(bp);
XFS_BUF_UNDELAYWRITE(bp);
if (bp) {
XFS_BUF_STALE(bp);
XFS_BUF_UNDELAYWRITE(bp);