gfs2: Use uid_eq and gid_eq where appropriate

Where kuid_t values are compared use uid_eq and where kgid_t values
are compared use gid_eq.  This is unfortunately necessary because
of the type safety that keeps someone from accidentally mixing
kuids and kgids with other types.

Cc: Steven Whitehouse <swhiteho@redhat.com>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>

diff --git a/fs/gfs2/acl.c b/fs/gfs2/acl.c
index f850020ad906a68cc715602e024f1a9bd18c1b88..f69ac0af5496cd456bf6df4d0c932747b6767779 100644 (file)
--- a/fs/gfs2/acl.c
+++ b/fs/gfs2/acl.c
@@ -237,7 +237,7 @@ static int gfs2_xattr_system_set(struct dentry *dentry, const char *name,
                return -EINVAL;
        if (type == ACL_TYPE_DEFAULT && !S_ISDIR(inode->i_mode))
                return value ? -EACCES : 0;
-       if ((current_fsuid() != inode->i_uid) && !capable(CAP_FOWNER))
+       if (!uid_eq(current_fsuid(), inode->i_uid) && !capable(CAP_FOWNER))
                return -EPERM;
        if (S_ISLNK(inode->i_mode))
                return -EOPNOTSUPP;

diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index ce07ce4734f474af7a4066700639ee0282e1b5ba..bb7c754f46a2dbcc1339840a4f95b060516b1a1e 100644 (file)
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -368,10 +368,11 @@ static void munge_mode_uid_gid(const struct gfs2_inode *dip,
                               struct inode *inode)
 {
        if (GFS2_SB(&dip->i_inode)->sd_args.ar_suiddir &&
-           (dip->i_inode.i_mode & S_ISUID) && dip->i_inode.i_uid) {
+           (dip->i_inode.i_mode & S_ISUID) &&
+           !uid_eq(dip->i_inode.i_uid, GLOBAL_ROOT_UID)) {
                if (S_ISDIR(inode->i_mode))
                        inode->i_mode |= S_ISUID;
-               else if (dip->i_inode.i_uid != current_fsuid())
+               else if (!uid_eq(dip->i_inode.i_uid, current_fsuid()))
                        inode->i_mode &= ~07111;
                inode->i_uid = dip->i_inode.i_uid;
        } else
@@ -978,8 +979,8 @@ static int gfs2_unlink_ok(struct gfs2_inode *dip, const struct qstr *name,
                return -EPERM;
 
        if ((dip->i_inode.i_mode & S_ISVTX) &&
-           dip->i_inode.i_uid != current_fsuid() &&
-           ip->i_inode.i_uid != current_fsuid() && !capable(CAP_FOWNER))
+           !uid_eq(dip->i_inode.i_uid, current_fsuid()) &&
+           !uid_eq(ip->i_inode.i_uid, current_fsuid()) && !capable(CAP_FOWNER))
                return -EPERM;
 
        if (IS_APPEND(&dip->i_inode))
@@ -1589,16 +1590,17 @@ static int setattr_chown(struct inode *inode, struct iattr *attr)
        nuid = attr->ia_uid;
        ngid = attr->ia_gid;
 
-       if (!(attr->ia_valid & ATTR_UID) || ouid == nuid)
+       if (!(attr->ia_valid & ATTR_UID) || uid_eq(ouid, nuid))
                ouid = nuid = NO_UID_QUOTA_CHANGE;
-       if (!(attr->ia_valid & ATTR_GID) || ogid == ngid)
+       if (!(attr->ia_valid & ATTR_GID) || gid_eq(ogid, ngid))
                ogid = ngid = NO_GID_QUOTA_CHANGE;
 
        error = gfs2_quota_lock(ip, nuid, ngid);
        if (error)
                return error;
 
-       if (ouid != NO_UID_QUOTA_CHANGE || ogid != NO_GID_QUOTA_CHANGE) {
+       if (!uid_eq(ouid, NO_UID_QUOTA_CHANGE) ||
+           !gid_eq(ogid, NO_GID_QUOTA_CHANGE)) {
                error = gfs2_quota_check(ip, nuid, ngid);
                if (error)
                        goto out_gunlock_q;
@@ -1612,7 +1614,8 @@ static int setattr_chown(struct inode *inode, struct iattr *attr)
        if (error)
                goto out_end_trans;
 
-       if (ouid != NO_UID_QUOTA_CHANGE || ogid != NO_GID_QUOTA_CHANGE) {
+       if (!uid_eq(ouid, NO_UID_QUOTA_CHANGE) ||
+           !gid_eq(ogid, NO_GID_QUOTA_CHANGE)) {
                u64 blocks = gfs2_get_inode_blocks(&ip->i_inode);
                gfs2_quota_change(ip, -blocks, ouid, ogid);
                gfs2_quota_change(ip, blocks, nuid, ngid);

diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
index 87f274039c4b0f4ae03030aeb684774d029f36ca..afd2e5d38e5a32125068adaa982e50c1f96a7a52 100644 (file)
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
@@ -525,7 +525,8 @@ int gfs2_quota_hold(struct gfs2_inode *ip, kuid_t uid, kgid_t gid)
        ip->i_res->rs_qa_qd_num++;
        qd++;
 
-       if (uid != NO_UID_QUOTA_CHANGE && uid != ip->i_inode.i_uid) {
+       if (!uid_eq(uid, NO_UID_QUOTA_CHANGE) &&
+           !uid_eq(uid, ip->i_inode.i_uid)) {
                error = qdsb_get(sdp, make_kqid_uid(uid), qd);
                if (error)
                        goto out;
@@ -533,7 +534,8 @@ int gfs2_quota_hold(struct gfs2_inode *ip, kuid_t uid, kgid_t gid)
                qd++;
        }
 
-       if (gid != NO_GID_QUOTA_CHANGE && gid != ip->i_inode.i_gid) {
+       if (!gid_eq(gid, NO_GID_QUOTA_CHANGE) &&
+           !gid_eq(gid, ip->i_inode.i_gid)) {
                error = qdsb_get(sdp, make_kqid_gid(gid), qd);
                if (error)
                        goto out;