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 tag 'xfs-for-linus-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc...
[firefly-linux-kernel-4.4.55.git]
/
fs
/
xfs
/
xfs_qm.c
diff --git
a/fs/xfs/xfs_qm.c
b/fs/xfs/xfs_qm.c
index eac9549efd52c824d7e298b494a470f43923936e..532ab79d38fe376c14a5463a97195b59a61d8f84 100644
(file)
--- a/
fs/xfs/xfs_qm.c
+++ b/
fs/xfs/xfs_qm.c
@@
-184,7
+184,7
@@
xfs_qm_dqpurge(
*/
ASSERT(!list_empty(&dqp->q_lru));
list_lru_del(&qi->qi_lru, &dqp->q_lru);
*/
ASSERT(!list_empty(&dqp->q_lru));
list_lru_del(&qi->qi_lru, &dqp->q_lru);
- XFS_STATS_DEC(xs_qm_dquot_unused);
+ XFS_STATS_DEC(
mp,
xs_qm_dquot_unused);
xfs_qm_dqdestroy(dqp);
return 0;
xfs_qm_dqdestroy(dqp);
return 0;
@@
-448,11
+448,11
@@
xfs_qm_dquot_isolate(
*/
if (dqp->q_nrefs) {
xfs_dqunlock(dqp);
*/
if (dqp->q_nrefs) {
xfs_dqunlock(dqp);
- XFS_STATS_INC(xs_qm_dqwants);
+ XFS_STATS_INC(
dqp->q_mount,
xs_qm_dqwants);
trace_xfs_dqreclaim_want(dqp);
list_lru_isolate(lru, &dqp->q_lru);
trace_xfs_dqreclaim_want(dqp);
list_lru_isolate(lru, &dqp->q_lru);
- XFS_STATS_DEC(xs_qm_dquot_unused);
+ XFS_STATS_DEC(
dqp->q_mount,
xs_qm_dquot_unused);
return LRU_REMOVED;
}
return LRU_REMOVED;
}
@@
-496,19
+496,19
@@
xfs_qm_dquot_isolate(
ASSERT(dqp->q_nrefs == 0);
list_lru_isolate_move(lru, &dqp->q_lru, &isol->dispose);
ASSERT(dqp->q_nrefs == 0);
list_lru_isolate_move(lru, &dqp->q_lru, &isol->dispose);
- XFS_STATS_DEC(xs_qm_dquot_unused);
+ XFS_STATS_DEC(
dqp->q_mount,
xs_qm_dquot_unused);
trace_xfs_dqreclaim_done(dqp);
trace_xfs_dqreclaim_done(dqp);
- XFS_STATS_INC(xs_qm_dqreclaims);
+ XFS_STATS_INC(
dqp->q_mount,
xs_qm_dqreclaims);
return LRU_REMOVED;
out_miss_busy:
trace_xfs_dqreclaim_busy(dqp);
return LRU_REMOVED;
out_miss_busy:
trace_xfs_dqreclaim_busy(dqp);
- XFS_STATS_INC(xs_qm_dqreclaim_misses);
+ XFS_STATS_INC(
dqp->q_mount,
xs_qm_dqreclaim_misses);
return LRU_SKIP;
out_unlock_dirty:
trace_xfs_dqreclaim_busy(dqp);
return LRU_SKIP;
out_unlock_dirty:
trace_xfs_dqreclaim_busy(dqp);
- XFS_STATS_INC(xs_qm_dqreclaim_misses);
+ XFS_STATS_INC(
dqp->q_mount,
xs_qm_dqreclaim_misses);
xfs_dqunlock(dqp);
spin_lock(lru_lock);
return LRU_RETRY;
xfs_dqunlock(dqp);
spin_lock(lru_lock);
return LRU_RETRY;
@@
-525,7
+525,7
@@
xfs_qm_shrink_scan(
unsigned long freed;
int error;
unsigned long freed;
int error;
- if ((sc->gfp_mask & (__GFP_FS|__GFP_
WAIT)) != (__GFP_FS|__GFP_WAIT
))
+ if ((sc->gfp_mask & (__GFP_FS|__GFP_
DIRECT_RECLAIM)) != (__GFP_FS|__GFP_DIRECT_RECLAIM
))
return 0;
INIT_LIST_HEAD(&isol.buffers);
return 0;
INIT_LIST_HEAD(&isol.buffers);