diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-03 17:00:06 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-03 17:00:06 +0100 |
| commit | 61420e147a706ee7c7a902008045547fb2a2a330 (patch) | |
| tree | c5739fe1feac05cac49c96107138520c65f8f657 /fs/xfs/quota/xfs_qm.c | |
| parent | [libata sata_promise] irq_pio: fix merge bug (diff) | |
| parent | Merge branch 'master' (diff) | |
| download | linux-61420e147a706ee7c7a902008045547fb2a2a330.tar.xz linux-61420e147a706ee7c7a902008045547fb2a2a330.zip | |
Merge branch 'upstream'
Diffstat (limited to 'fs/xfs/quota/xfs_qm.c')
| -rw-r--r-- | fs/xfs/quota/xfs_qm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/quota/xfs_qm.c b/fs/xfs/quota/xfs_qm.c index 1aea42d71a64..5328a2937127 100644 --- a/fs/xfs/quota/xfs_qm.c +++ b/fs/xfs/quota/xfs_qm.c @@ -78,7 +78,7 @@ STATIC int xfs_qm_dqhashlock_nowait(xfs_dquot_t *); STATIC int xfs_qm_init_quotainos(xfs_mount_t *); STATIC int xfs_qm_init_quotainfo(xfs_mount_t *); -STATIC int xfs_qm_shake(int, unsigned int); +STATIC int xfs_qm_shake(int, gfp_t); #ifdef DEBUG extern mutex_t qcheck_lock; @@ -2197,7 +2197,7 @@ xfs_qm_shake_freelist( */ /* ARGSUSED */ STATIC int -xfs_qm_shake(int nr_to_scan, unsigned int gfp_mask) +xfs_qm_shake(int nr_to_scan, gfp_t gfp_mask) { int ndqused, nfree, n; |