diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-09-30 10:24:05 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-09-30 10:24:05 +0200 |
| commit | 5498380e4f403c0938801e2cd6683353d0029cac (patch) | |
| tree | c65ab75034cac68e45da4d5bbb1513728bacec84 /fs/gfs2/incore.h | |
| parent | e76bf634870e3c5e3a767ad575f1d404c9f1cab8 (diff) | |
| parent | 82b925c405444b760e743b55a9ad498cb3551afe (diff) | |
| download | lwn-5498380e4f403c0938801e2cd6683353d0029cac.tar.gz lwn-5498380e4f403c0938801e2cd6683353d0029cac.zip | |
Merge tag 'asoc-v3.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.17
A few small driver specific fixes and a couple of error handling fixes
in the core.
Diffstat (limited to 'fs/gfs2/incore.h')
| -rw-r--r-- | fs/gfs2/incore.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h index 67d310c9ada3..39e7e9959b74 100644 --- a/fs/gfs2/incore.h +++ b/fs/gfs2/incore.h @@ -262,6 +262,9 @@ struct gfs2_holder { unsigned long gh_ip; }; +/* Number of quota types we support */ +#define GFS2_MAXQUOTAS 2 + /* Resource group multi-block reservation, in order of appearance: Step 1. Function prepares to write, allocates a mb, sets the size hint. @@ -282,8 +285,8 @@ struct gfs2_blkreserv { u64 rs_inum; /* Inode number for reservation */ /* ancillary quota stuff */ - struct gfs2_quota_data *rs_qa_qd[2 * MAXQUOTAS]; - struct gfs2_holder rs_qa_qd_ghs[2 * MAXQUOTAS]; + struct gfs2_quota_data *rs_qa_qd[2 * GFS2_MAXQUOTAS]; + struct gfs2_holder rs_qa_qd_ghs[2 * GFS2_MAXQUOTAS]; unsigned int rs_qa_qd_num; }; |