Commit 37f71577 authored by Bob Peterson's avatar Bob Peterson Committed by Steven Whitehouse

GFS2: two minor quota fixups

This patch fixes two regression problems that Abhi found in the
GFS2 quota code.
Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent c7788792
...@@ -121,7 +121,7 @@ static u64 qd2index(struct gfs2_quota_data *qd) ...@@ -121,7 +121,7 @@ static u64 qd2index(struct gfs2_quota_data *qd)
{ {
struct kqid qid = qd->qd_id; struct kqid qid = qd->qd_id;
return (2 * (u64)from_kqid(&init_user_ns, qid)) + 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) static u64 qd2offset(struct gfs2_quota_data *qd)
...@@ -721,7 +721,7 @@ static int gfs2_adjust_quota(struct gfs2_inode *ip, loff_t loc, ...@@ -721,7 +721,7 @@ static int gfs2_adjust_quota(struct gfs2_inode *ip, loff_t loc,
goto unlock_out; goto unlock_out;
} }
gfs2_trans_add_meta(ip->i_gl, bh); gfs2_trans_add_data(ip->i_gl, bh);
kaddr = kmap_atomic(page); kaddr = kmap_atomic(page);
if (offset + sizeof(struct gfs2_quota) > PAGE_CACHE_SIZE) if (offset + sizeof(struct gfs2_quota) > PAGE_CACHE_SIZE)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment