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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
fs
/
xfs
/
quota
/
xfs_dquot_item.c
diff --git
a/fs/xfs/quota/xfs_dquot_item.c
b/fs/xfs/quota/xfs_dquot_item.c
index
546f48a
..
5b2dcc5
100644
(file)
--- a/
fs/xfs/quota/xfs_dquot_item.c
+++ b/
fs/xfs/quota/xfs_dquot_item.c
@@
-23,7
+23,6
@@
#include "xfs_trans.h"
#include "xfs_sb.h"
#include "xfs_ag.h"
#include "xfs_trans.h"
#include "xfs_sb.h"
#include "xfs_ag.h"
-#include "xfs_dir.h"
#include "xfs_dir2.h"
#include "xfs_alloc.h"
#include "xfs_dmapi.h"
#include "xfs_dir2.h"
#include "xfs_alloc.h"
#include "xfs_dmapi.h"
@@
-32,7
+31,6
@@
#include "xfs_bmap_btree.h"
#include "xfs_alloc_btree.h"
#include "xfs_ialloc_btree.h"
#include "xfs_bmap_btree.h"
#include "xfs_alloc_btree.h"
#include "xfs_ialloc_btree.h"
-#include "xfs_dir_sf.h"
#include "xfs_dir2_sf.h"
#include "xfs_attr_sf.h"
#include "xfs_dinode.h"
#include "xfs_dir2_sf.h"
#include "xfs_attr_sf.h"
#include "xfs_dinode.h"
@@
-248,7
+246,7
@@
xfs_qm_dquot_logitem_pushbuf(
* inode flush completed and the inode was taken off the AIL.
* So, just get out.
*/
* inode flush completed and the inode was taken off the AIL.
* So, just get out.
*/
- if (
(valusema(&(dqp->q_flock)) > 0
) ||
+ if (
!issemalocked(&(dqp->q_flock)
) ||
((qip->qli_item.li_flags & XFS_LI_IN_AIL) == 0)) {
qip->qli_pushbuf_flag = 0;
xfs_dqunlock(dqp);
((qip->qli_item.li_flags & XFS_LI_IN_AIL) == 0)) {
qip->qli_pushbuf_flag = 0;
xfs_dqunlock(dqp);
@@
-261,7
+259,7
@@
xfs_qm_dquot_logitem_pushbuf(
if (bp != NULL) {
if (XFS_BUF_ISDELAYWRITE(bp)) {
dopush = ((qip->qli_item.li_flags & XFS_LI_IN_AIL) &&
if (bp != NULL) {
if (XFS_BUF_ISDELAYWRITE(bp)) {
dopush = ((qip->qli_item.li_flags & XFS_LI_IN_AIL) &&
-
(valusema(&(dqp->q_flock)) <= 0
));
+
issemalocked(&(dqp->q_flock)
));
qip->qli_pushbuf_flag = 0;
xfs_dqunlock(dqp);
qip->qli_pushbuf_flag = 0;
xfs_dqunlock(dqp);