diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-24 09:31:05 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-24 09:31:05 -0500 |
| commit | aaadff81195056c7c14e0d834b3318c624c0fd78 (patch) | |
| tree | 34d66d8dcb25fa9ffb568f8acfdb317ddf203b44 /fs/xfs | |
| parent | c6329f4df2263ab5a40601a5236639e61b682f51 (diff) | |
| parent | df7addbb45874f0f992266003155de5a22e1872f (diff) | |
Merge branch 'master'
Diffstat (limited to 'fs/xfs')
| -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 1aea42d71a..5328a29371 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 *); | |||
| 78 | 78 | ||
| 79 | STATIC int xfs_qm_init_quotainos(xfs_mount_t *); | 79 | STATIC int xfs_qm_init_quotainos(xfs_mount_t *); |
| 80 | STATIC int xfs_qm_init_quotainfo(xfs_mount_t *); | 80 | STATIC int xfs_qm_init_quotainfo(xfs_mount_t *); |
| 81 | STATIC int xfs_qm_shake(int, unsigned int); | 81 | STATIC int xfs_qm_shake(int, gfp_t); |
| 82 | 82 | ||
| 83 | #ifdef DEBUG | 83 | #ifdef DEBUG |
| 84 | extern mutex_t qcheck_lock; | 84 | extern mutex_t qcheck_lock; |
| @@ -2197,7 +2197,7 @@ xfs_qm_shake_freelist( | |||
| 2197 | */ | 2197 | */ |
| 2198 | /* ARGSUSED */ | 2198 | /* ARGSUSED */ |
| 2199 | STATIC int | 2199 | STATIC int |
| 2200 | xfs_qm_shake(int nr_to_scan, unsigned int gfp_mask) | 2200 | xfs_qm_shake(int nr_to_scan, gfp_t gfp_mask) |
| 2201 | { | 2201 | { |
| 2202 | int ndqused, nfree, n; | 2202 | int ndqused, nfree, n; |
| 2203 | 2203 | ||