[Cluster-devel] [PATCH 4/5] gfs2: Don't use MAXQUOTAS value

[Steven Whitehouse <swhiteho@redhat.com>]

Hi,

On 10/09/14 20:22, Jan Kara wrote:
> MAXQUOTAS value defines maximum number of quota types VFS supports.
> This isn't necessarily the number of types gfs2 supports and with
> addition of project quotas these two numbers stop matching. So make gfs2
> use its private definition.
Now in the GFS2 -nmw tree. Thanks,

Steve.

> CC: Steven Whitehouse <swhiteho@redhat.com>
> CC: cluster-devel at redhat.com
> Signed-off-by: Jan Kara <jack@suse.cz>
> ---
>   fs/gfs2/incore.h | 7 +++++--
>   1 file 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;
>   };
>