diff options
author | Christoph Hellwig <hch@lst.de> | 2010-06-04 04:56:01 -0400 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2010-07-21 10:01:46 -0400 |
commit | ade7ce31c22e961dfbe1a6d57fd362c90c187cbd (patch) | |
tree | 96a64a3ae76a182e80db8457e49aa30355b54ae3 /fs/gfs2/quota.c | |
parent | 7af9cce8ae467bb2fcf3b0b6be3898835bdb984c (diff) |
quota: Clean up the namespace in dqblk_xfs.h
Almost all identifiers use the FS_* namespace, so rename the missing few
XFS_* ones to FS_* as well. Without this some people might get upset
about having too many XFS names in generic code.
Acked-by: Steven Whitehouse <swhiteho@redhat.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/gfs2/quota.c')
-rw-r--r-- | fs/gfs2/quota.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c index b256d6f24288..ce345f8c69c2 100644 --- a/fs/gfs2/quota.c +++ b/fs/gfs2/quota.c | |||
@@ -1455,10 +1455,10 @@ static int gfs2_quota_get_xstate(struct super_block *sb, | |||
1455 | 1455 | ||
1456 | switch (sdp->sd_args.ar_quota) { | 1456 | switch (sdp->sd_args.ar_quota) { |
1457 | case GFS2_QUOTA_ON: | 1457 | case GFS2_QUOTA_ON: |
1458 | fqs->qs_flags |= (XFS_QUOTA_UDQ_ENFD | XFS_QUOTA_GDQ_ENFD); | 1458 | fqs->qs_flags |= (FS_QUOTA_UDQ_ENFD | FS_QUOTA_GDQ_ENFD); |
1459 | /*FALLTHRU*/ | 1459 | /*FALLTHRU*/ |
1460 | case GFS2_QUOTA_ACCOUNT: | 1460 | case GFS2_QUOTA_ACCOUNT: |
1461 | fqs->qs_flags |= (XFS_QUOTA_UDQ_ACCT | XFS_QUOTA_GDQ_ACCT); | 1461 | fqs->qs_flags |= (FS_QUOTA_UDQ_ACCT | FS_QUOTA_GDQ_ACCT); |
1462 | break; | 1462 | break; |
1463 | case GFS2_QUOTA_OFF: | 1463 | case GFS2_QUOTA_OFF: |
1464 | break; | 1464 | break; |
@@ -1504,7 +1504,7 @@ static int gfs2_get_dqblk(struct super_block *sb, int type, qid_t id, | |||
1504 | 1504 | ||
1505 | qlvb = (struct gfs2_quota_lvb *)qd->qd_gl->gl_lvb; | 1505 | qlvb = (struct gfs2_quota_lvb *)qd->qd_gl->gl_lvb; |
1506 | fdq->d_version = FS_DQUOT_VERSION; | 1506 | fdq->d_version = FS_DQUOT_VERSION; |
1507 | fdq->d_flags = (type == QUOTA_USER) ? XFS_USER_QUOTA : XFS_GROUP_QUOTA; | 1507 | fdq->d_flags = (type == QUOTA_USER) ? FS_USER_QUOTA : FS_GROUP_QUOTA; |
1508 | fdq->d_id = id; | 1508 | fdq->d_id = id; |
1509 | fdq->d_blk_hardlimit = be64_to_cpu(qlvb->qb_limit); | 1509 | fdq->d_blk_hardlimit = be64_to_cpu(qlvb->qb_limit); |
1510 | fdq->d_blk_softlimit = be64_to_cpu(qlvb->qb_warn); | 1510 | fdq->d_blk_softlimit = be64_to_cpu(qlvb->qb_warn); |
@@ -1539,12 +1539,12 @@ static int gfs2_set_dqblk(struct super_block *sb, int type, qid_t id, | |||
1539 | switch(type) { | 1539 | switch(type) { |
1540 | case USRQUOTA: | 1540 | case USRQUOTA: |
1541 | type = QUOTA_USER; | 1541 | type = QUOTA_USER; |
1542 | if (fdq->d_flags != XFS_USER_QUOTA) | 1542 | if (fdq->d_flags != FS_USER_QUOTA) |
1543 | return -EINVAL; | 1543 | return -EINVAL; |
1544 | break; | 1544 | break; |
1545 | case GRPQUOTA: | 1545 | case GRPQUOTA: |
1546 | type = QUOTA_GROUP; | 1546 | type = QUOTA_GROUP; |
1547 | if (fdq->d_flags != XFS_GROUP_QUOTA) | 1547 | if (fdq->d_flags != FS_GROUP_QUOTA) |
1548 | return -EINVAL; | 1548 | return -EINVAL; |
1549 | break; | 1549 | break; |
1550 | default: | 1550 | default: |