From mboxrd@z Thu Jan  1 00:00:00 1970
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Mon, 13 May 2013 10:30:35 +0100
Subject: [Cluster-devel] [GFS2 PATCH] GFS2: two minor quota fixups
In-Reply-To: <1508724776.73821292.1368201558288.JavaMail.root@redhat.com>
References: <1508724776.73821292.1368201558288.JavaMail.root@redhat.com>
Message-ID: <1368437435.2882.15.camel@menhir>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

Hi,

Now in the -nmw tree. Thanks,

Steve.

On Fri, 2013-05-10 at 11:59 -0400, Bob Peterson wrote:
> Hi,
> 
> This patch fixes two regression problems that Abhi found in the
> GFS2 quota code.
> 
> Regards,
> 
> Bob Peterson
> Red Hat File Systems
> 
> Signed-off-by: Bob Peterson <rpeterso@redhat.com> 
> ---
> diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
> index c7c840e..c253b13 100644
> --- a/fs/gfs2/quota.c
> +++ b/fs/gfs2/quota.c
> @@ -121,7 +121,7 @@ static u64 qd2index(struct gfs2_quota_data *qd)
>  {
>  	struct kqid qid = qd->qd_id;
>  	return (2 * (u64)from_kqid(&init_user_ns, qid)) +
> -		(qid.type == USRQUOTA) ? 0 : 1;
> +		((qid.type == USRQUOTA) ? 0 : 1);
>  }
>  
>  static u64 qd2offset(struct gfs2_quota_data *qd)
> @@ -721,7 +721,7 @@ get_a_page:
>  			goto unlock_out;
>  	}
>  
> -	gfs2_trans_add_meta(ip->i_gl, bh);
> +	gfs2_trans_add_data(ip->i_gl, bh);
>  
>  	kaddr = kmap_atomic(page);
>  	if (offset + sizeof(struct gfs2_quota) > PAGE_CACHE_SIZE)
>