projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'xfs-io-fixes' into for-next
[firefly-linux-kernel-4.4.55.git]
/
fs
/
xfs
/
xfs_dquot.c
diff --git
a/fs/xfs/xfs_dquot.c
b/fs/xfs/xfs_dquot.c
index 30cb3afb67f091e3e96f7b6a6d189d4464706b68..7ac6c5c586cbadbd7784f24c7880f72d7ff66ed0 100644
(file)
--- a/
fs/xfs/xfs_dquot.c
+++ b/
fs/xfs/xfs_dquot.c
@@
-75,9
+75,9
@@
xfs_qm_dqdestroy(
ASSERT(list_empty(&dqp->q_lru));
mutex_destroy(&dqp->q_qlock);
ASSERT(list_empty(&dqp->q_lru));
mutex_destroy(&dqp->q_qlock);
- kmem_zone_free(xfs_qm_dqzone, dqp);
- XFS_STATS_DEC(xs_qm_dquot);
+ XFS_STATS_DEC(dqp->q_mount, xs_qm_dquot);
+ kmem_zone_free(xfs_qm_dqzone, dqp);
}
/*
}
/*
@@
-605,7
+605,7
@@
xfs_qm_dqread(
break;
}
break;
}
- XFS_STATS_INC(xs_qm_dquot);
+ XFS_STATS_INC(
mp,
xs_qm_dquot);
trace_xfs_dqread(dqp);
trace_xfs_dqread(dqp);
@@
-747,12
+747,12
@@
restart:
mutex_unlock(&qi->qi_tree_lock);
trace_xfs_dqget_hit(dqp);
mutex_unlock(&qi->qi_tree_lock);
trace_xfs_dqget_hit(dqp);
- XFS_STATS_INC(xs_qm_dqcachehits);
+ XFS_STATS_INC(
mp,
xs_qm_dqcachehits);
*O_dqpp = dqp;
return 0;
}
mutex_unlock(&qi->qi_tree_lock);
*O_dqpp = dqp;
return 0;
}
mutex_unlock(&qi->qi_tree_lock);
- XFS_STATS_INC(xs_qm_dqcachemisses);
+ XFS_STATS_INC(
mp,
xs_qm_dqcachemisses);
/*
* Dquot cache miss. We don't want to keep the inode lock across
/*
* Dquot cache miss. We don't want to keep the inode lock across
@@
-806,7
+806,7
@@
restart:
mutex_unlock(&qi->qi_tree_lock);
trace_xfs_dqget_dup(dqp);
xfs_qm_dqdestroy(dqp);
mutex_unlock(&qi->qi_tree_lock);
trace_xfs_dqget_dup(dqp);
xfs_qm_dqdestroy(dqp);
- XFS_STATS_INC(xs_qm_dquot_dups);
+ XFS_STATS_INC(
mp,
xs_qm_dquot_dups);
goto restart;
}
goto restart;
}
@@
-846,7
+846,7
@@
xfs_qm_dqput(
trace_xfs_dqput_free(dqp);
if (list_lru_add(&qi->qi_lru, &dqp->q_lru))
trace_xfs_dqput_free(dqp);
if (list_lru_add(&qi->qi_lru, &dqp->q_lru))
- XFS_STATS_INC(xs_qm_dquot_unused);
+ XFS_STATS_INC(
dqp->q_mount,
xs_qm_dquot_unused);
}
xfs_dqunlock(dqp);
}
}
xfs_dqunlock(dqp);
}