diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-17 13:25:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-17 13:25:08 +0000 |
| commit | 59223edaa18759982db0a8aced0e77457d10c68e (patch) | |
| tree | 89354903b01fa0a447bffeefe00df3044495db2e /fs/dquot.c | |
| parent | db7d4daea91e105e3859cf461d7e53b9b77454b2 (diff) | |
Merge with Linux 2.3.6. Sorry, this isn't tested on silicon, I don't
have a MIPS box at hand.
Diffstat (limited to 'fs/dquot.c')
| -rw-r--r-- | fs/dquot.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/dquot.c b/fs/dquot.c index 76630352f..dfef0a63a 100644 --- a/fs/dquot.c +++ b/fs/dquot.c @@ -79,8 +79,8 @@ static struct dquot *dquot_hash[NR_DQHASH]; static int dquot_updating[NR_DQHASH]; static struct dqstats dqstats; -static struct wait_queue *dquot_wait = (struct wait_queue *)NULL, - *update_wait = (struct wait_queue *)NULL; +static DECLARE_WAIT_QUEUE_HEAD(dquot_wait); +static DECLARE_WAIT_QUEUE_HEAD(update_wait); static inline char is_enabled(struct vfsmount *vfsmnt, short type) { @@ -195,7 +195,7 @@ static inline void remove_inuse(struct dquot *dquot) static void __wait_on_dquot(struct dquot *dquot) { - struct wait_queue wait = { current, NULL }; + DECLARE_WAITQUEUE(wait, current); add_wait_queue(&dquot->dq_wait, &wait); repeat: @@ -429,6 +429,7 @@ static void grow_dquots(void) nr_dquots++; memset((caddr_t)dquot, 0, sizeof(struct dquot)); + init_waitqueue_head(&dquot->dq_wait); /* all dquots go on the inuse_list */ put_inuse(dquot); put_dquot_head(dquot); |