summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorBob Peterson <rpeterso@redhat.com>2013-05-10 11:59:18 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2013-05-24 13:47:13 +0100
commit37f715774e2dd9ae521334dbbc3af63becd47adb (patch)
tree37be3f5b5e52ac3046f138cf07a5358ab4943165 /fs
parentc7788792a5e7b0d5d7f96d0766b4cb6112d47d75 (diff)
downloadop-kernel-dev-37f715774e2dd9ae521334dbbc3af63becd47adb.zip
op-kernel-dev-37f715774e2dd9ae521334dbbc3af63becd47adb.tar.gz
GFS2: two minor quota fixups
This patch fixes two regression problems that Abhi found in the GFS2 quota code. Signed-off-by: Bob Peterson <rpeterso@redhat.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/gfs2/quota.c4
1 files changed, 2 insertions, 2 deletions
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)
OpenPOWER on IntegriCloud