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/xfs/quota | |
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/xfs/quota')
-rw-r--r-- | fs/xfs/quota/xfs_qm_syscalls.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/fs/xfs/quota/xfs_qm_syscalls.c b/fs/xfs/quota/xfs_qm_syscalls.c index b4487764e923..41b04b96975b 100644 --- a/fs/xfs/quota/xfs_qm_syscalls.c +++ b/fs/xfs/quota/xfs_qm_syscalls.c | |||
@@ -786,9 +786,9 @@ xfs_qm_export_dquot( | |||
786 | } | 786 | } |
787 | 787 | ||
788 | #ifdef DEBUG | 788 | #ifdef DEBUG |
789 | if (((XFS_IS_UQUOTA_ENFORCED(mp) && dst->d_flags == XFS_USER_QUOTA) || | 789 | if (((XFS_IS_UQUOTA_ENFORCED(mp) && dst->d_flags == FS_USER_QUOTA) || |
790 | (XFS_IS_OQUOTA_ENFORCED(mp) && | 790 | (XFS_IS_OQUOTA_ENFORCED(mp) && |
791 | (dst->d_flags & (XFS_PROJ_QUOTA | XFS_GROUP_QUOTA)))) && | 791 | (dst->d_flags & (FS_PROJ_QUOTA | FS_GROUP_QUOTA)))) && |
792 | dst->d_id != 0) { | 792 | dst->d_id != 0) { |
793 | if (((int) dst->d_bcount >= (int) dst->d_blk_softlimit) && | 793 | if (((int) dst->d_bcount >= (int) dst->d_blk_softlimit) && |
794 | (dst->d_blk_softlimit > 0)) { | 794 | (dst->d_blk_softlimit > 0)) { |
@@ -809,17 +809,17 @@ xfs_qm_export_qtype_flags( | |||
809 | /* | 809 | /* |
810 | * Can't be more than one, or none. | 810 | * Can't be more than one, or none. |
811 | */ | 811 | */ |
812 | ASSERT((flags & (XFS_PROJ_QUOTA | XFS_USER_QUOTA)) != | 812 | ASSERT((flags & (FS_PROJ_QUOTA | FS_USER_QUOTA)) != |
813 | (XFS_PROJ_QUOTA | XFS_USER_QUOTA)); | 813 | (FS_PROJ_QUOTA | FS_USER_QUOTA)); |
814 | ASSERT((flags & (XFS_PROJ_QUOTA | XFS_GROUP_QUOTA)) != | 814 | ASSERT((flags & (FS_PROJ_QUOTA | FS_GROUP_QUOTA)) != |
815 | (XFS_PROJ_QUOTA | XFS_GROUP_QUOTA)); | 815 | (FS_PROJ_QUOTA | FS_GROUP_QUOTA)); |
816 | ASSERT((flags & (XFS_USER_QUOTA | XFS_GROUP_QUOTA)) != | 816 | ASSERT((flags & (FS_USER_QUOTA | FS_GROUP_QUOTA)) != |
817 | (XFS_USER_QUOTA | XFS_GROUP_QUOTA)); | 817 | (FS_USER_QUOTA | FS_GROUP_QUOTA)); |
818 | ASSERT((flags & (XFS_PROJ_QUOTA|XFS_USER_QUOTA|XFS_GROUP_QUOTA)) != 0); | 818 | ASSERT((flags & (FS_PROJ_QUOTA|FS_USER_QUOTA|FS_GROUP_QUOTA)) != 0); |
819 | 819 | ||
820 | return (flags & XFS_DQ_USER) ? | 820 | return (flags & XFS_DQ_USER) ? |
821 | XFS_USER_QUOTA : (flags & XFS_DQ_PROJ) ? | 821 | FS_USER_QUOTA : (flags & XFS_DQ_PROJ) ? |
822 | XFS_PROJ_QUOTA : XFS_GROUP_QUOTA; | 822 | FS_PROJ_QUOTA : FS_GROUP_QUOTA; |
823 | } | 823 | } |
824 | 824 | ||
825 | STATIC uint | 825 | STATIC uint |
@@ -830,16 +830,16 @@ xfs_qm_export_flags( | |||
830 | 830 | ||
831 | uflags = 0; | 831 | uflags = 0; |
832 | if (flags & XFS_UQUOTA_ACCT) | 832 | if (flags & XFS_UQUOTA_ACCT) |
833 | uflags |= XFS_QUOTA_UDQ_ACCT; | 833 | uflags |= FS_QUOTA_UDQ_ACCT; |
834 | if (flags & XFS_PQUOTA_ACCT) | 834 | if (flags & XFS_PQUOTA_ACCT) |
835 | uflags |= XFS_QUOTA_PDQ_ACCT; | 835 | uflags |= FS_QUOTA_PDQ_ACCT; |
836 | if (flags & XFS_GQUOTA_ACCT) | 836 | if (flags & XFS_GQUOTA_ACCT) |
837 | uflags |= XFS_QUOTA_GDQ_ACCT; | 837 | uflags |= FS_QUOTA_GDQ_ACCT; |
838 | if (flags & XFS_UQUOTA_ENFD) | 838 | if (flags & XFS_UQUOTA_ENFD) |
839 | uflags |= XFS_QUOTA_UDQ_ENFD; | 839 | uflags |= FS_QUOTA_UDQ_ENFD; |
840 | if (flags & (XFS_OQUOTA_ENFD)) { | 840 | if (flags & (XFS_OQUOTA_ENFD)) { |
841 | uflags |= (flags & XFS_GQUOTA_ACCT) ? | 841 | uflags |= (flags & XFS_GQUOTA_ACCT) ? |
842 | XFS_QUOTA_GDQ_ENFD : XFS_QUOTA_PDQ_ENFD; | 842 | FS_QUOTA_GDQ_ENFD : FS_QUOTA_PDQ_ENFD; |
843 | } | 843 | } |
844 | return (uflags); | 844 | return (uflags); |
845 | } | 845 | } |