From: "Eric W. Biederman" <ebiederm@xmission.com>
To: <linux-fsdevel@vger.kernel.org>
Cc: Linux Containers <containers@lists.linux-foundation.org>,
<linux-kernel@vger.kernel.org>,
"Serge E. Hallyn" <serge@hallyn.com>,
"Eric W. Biederman" <ebiederm@xmission.com>,
Steven Whitehouse <swhiteho@redhat.com>
Subject: [PATCH review 28/85] gfs2: Split NO_QUOTA_CHANGE inot NO_UID_QUTOA_CHANGE and NO_GID_QUTOA_CHANGE
Date: Wed, 13 Feb 2013 09:51:17 -0800 [thread overview]
Message-ID: <1360777934-5663-28-git-send-email-ebiederm@xmission.com> (raw)
In-Reply-To: <1360777934-5663-1-git-send-email-ebiederm@xmission.com>
From: "Eric W. Biederman" <ebiederm@xmission.com>
Split NO_QUOTA_CHANGE into NO_UID_QUTOA_CHANGE and NO_GID_QUTOA_CHANGE
so the constants may be well typed.
Cc: Steven Whitehouse <swhiteho@redhat.com>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
---
fs/gfs2/bmap.c | 2 +-
fs/gfs2/dir.c | 2 +-
fs/gfs2/inode.c | 10 +++++-----
fs/gfs2/quota.c | 4 ++--
fs/gfs2/quota.h | 5 +++--
fs/gfs2/super.c | 2 +-
fs/gfs2/xattr.c | 4 ++--
7 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c
index a68e91b..10c54e3 100644
--- a/fs/gfs2/bmap.c
+++ b/fs/gfs2/bmap.c
@@ -1098,7 +1098,7 @@ static int trunc_dealloc(struct gfs2_inode *ip, u64 size)
if (error)
return error;
- error = gfs2_quota_hold(ip, NO_QUOTA_CHANGE, NO_QUOTA_CHANGE);
+ error = gfs2_quota_hold(ip, NO_UID_QUOTA_CHANGE, NO_GID_QUOTA_CHANGE);
if (error)
return error;
diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c
index 9a35670..6d3e3e2 100644
--- a/fs/gfs2/dir.c
+++ b/fs/gfs2/dir.c
@@ -1849,7 +1849,7 @@ static int leaf_dealloc(struct gfs2_inode *dip, u32 index, u32 len,
if (!ht)
return -ENOMEM;
- error = gfs2_quota_hold(dip, NO_QUOTA_CHANGE, NO_QUOTA_CHANGE);
+ error = gfs2_quota_hold(dip, NO_UID_QUOTA_CHANGE, NO_GID_QUOTA_CHANGE);
if (error)
goto out;
diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index 2b6f569..aa10502 100644
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -548,7 +548,7 @@ static int link_dinode(struct gfs2_inode *dip, const struct qstr *name,
if (error)
return error;
- error = gfs2_quota_lock(dip, NO_QUOTA_CHANGE, NO_QUOTA_CHANGE);
+ error = gfs2_quota_lock(dip, NO_UID_QUOTA_CHANGE, NO_GID_QUOTA_CHANGE);
if (error)
goto fail;
@@ -1589,15 +1589,15 @@ static int setattr_chown(struct inode *inode, struct iattr *attr)
ngid = attr->ia_gid;
if (!(attr->ia_valid & ATTR_UID) || ouid == nuid)
- ouid = nuid = NO_QUOTA_CHANGE;
+ ouid = nuid = NO_UID_QUOTA_CHANGE;
if (!(attr->ia_valid & ATTR_GID) || ogid == ngid)
- ogid = ngid = NO_QUOTA_CHANGE;
+ ogid = ngid = NO_GID_QUOTA_CHANGE;
error = gfs2_quota_lock(ip, nuid, ngid);
if (error)
return error;
- if (ouid != NO_QUOTA_CHANGE || ogid != NO_QUOTA_CHANGE) {
+ if (ouid != NO_UID_QUOTA_CHANGE || ogid != NO_GID_QUOTA_CHANGE) {
error = gfs2_quota_check(ip, nuid, ngid);
if (error)
goto out_gunlock_q;
@@ -1611,7 +1611,7 @@ static int setattr_chown(struct inode *inode, struct iattr *attr)
if (error)
goto out_end_trans;
- if (ouid != NO_QUOTA_CHANGE || ogid != NO_QUOTA_CHANGE) {
+ if (ouid != NO_UID_QUOTA_CHANGE || 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 e4f6ccf..dbfacaa 100644
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
@@ -524,7 +524,7 @@ int gfs2_quota_hold(struct gfs2_inode *ip, u32 uid, u32 gid)
ip->i_res->rs_qa_qd_num++;
qd++;
- if (uid != NO_QUOTA_CHANGE && uid != ip->i_inode.i_uid) {
+ if (uid != NO_UID_QUOTA_CHANGE && uid != ip->i_inode.i_uid) {
error = qdsb_get(sdp, QUOTA_USER, uid, qd);
if (error)
goto out;
@@ -532,7 +532,7 @@ int gfs2_quota_hold(struct gfs2_inode *ip, u32 uid, u32 gid)
qd++;
}
- if (gid != NO_QUOTA_CHANGE && gid != ip->i_inode.i_gid) {
+ if (gid != NO_GID_QUOTA_CHANGE && gid != ip->i_inode.i_gid) {
error = qdsb_get(sdp, QUOTA_GROUP, gid, qd);
if (error)
goto out;
diff --git a/fs/gfs2/quota.h b/fs/gfs2/quota.h
index f25d98b..7f67323 100644
--- a/fs/gfs2/quota.h
+++ b/fs/gfs2/quota.h
@@ -14,7 +14,8 @@ struct gfs2_inode;
struct gfs2_sbd;
struct shrink_control;
-#define NO_QUOTA_CHANGE ((u32)-1)
+#define NO_UID_QUOTA_CHANGE INVALID_UID
+#define NO_GID_QUOTA_CHANGE INVALID_GID
extern int gfs2_quota_hold(struct gfs2_inode *ip, u32 uid, u32 gid);
extern void gfs2_quota_unhold(struct gfs2_inode *ip);
@@ -41,7 +42,7 @@ static inline int gfs2_quota_lock_check(struct gfs2_inode *ip)
int ret;
if (sdp->sd_args.ar_quota == GFS2_QUOTA_OFF)
return 0;
- ret = gfs2_quota_lock(ip, NO_QUOTA_CHANGE, NO_QUOTA_CHANGE);
+ ret = gfs2_quota_lock(ip, NO_UID_QUOTA_CHANGE, NO_GID_QUOTA_CHANGE);
if (ret)
return ret;
if (sdp->sd_args.ar_quota != GFS2_QUOTA_ON)
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index d648867..7cc5a60 100644
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -1429,7 +1429,7 @@ static int gfs2_dinode_dealloc(struct gfs2_inode *ip)
if (error)
return error;
- error = gfs2_quota_hold(ip, NO_QUOTA_CHANGE, NO_QUOTA_CHANGE);
+ error = gfs2_quota_hold(ip, NO_UID_QUOTA_CHANGE, NO_GID_QUOTA_CHANGE);
if (error)
return error;
diff --git a/fs/gfs2/xattr.c b/fs/gfs2/xattr.c
index 76c144b..80c25ae 100644
--- a/fs/gfs2/xattr.c
+++ b/fs/gfs2/xattr.c
@@ -331,7 +331,7 @@ static int ea_remove_unstuffed(struct gfs2_inode *ip, struct buffer_head *bh,
if (error)
return error;
- error = gfs2_quota_hold(ip, NO_QUOTA_CHANGE, NO_QUOTA_CHANGE);
+ error = gfs2_quota_hold(ip, NO_UID_QUOTA_CHANGE, NO_GID_QUOTA_CHANGE);
if (error)
goto out_alloc;
@@ -1461,7 +1461,7 @@ int gfs2_ea_dealloc(struct gfs2_inode *ip)
if (error)
return error;
- error = gfs2_quota_hold(ip, NO_QUOTA_CHANGE, NO_QUOTA_CHANGE);
+ error = gfs2_quota_hold(ip, NO_UID_QUOTA_CHANGE, NO_GID_QUOTA_CHANGE);
if (error)
return error;
--
1.7.5.4
next prev parent reply other threads:[~2013-02-13 17:58 UTC|newest]
Thread overview: 109+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <87621w14vs.fsf@xmission.com>
2013-02-13 17:50 ` [PATCH review 01/85] ceph: Only allow mounts in the initial network namespace Eric W. Biederman
2013-02-13 17:50 ` [PATCH review 02/85] ceph: Translate between uid and gids in cap messages and kuids and kgids Eric W. Biederman
2013-02-13 17:50 ` [PATCH review 03/85] ceph: Translate inode uid and gid attributes to/from " Eric W. Biederman
2013-02-13 17:50 ` [PATCH review 04/85] ceph: Convert struct ceph_mds_request to use kuid_t and kgid_t Eric W. Biederman
2013-02-13 17:50 ` [PATCH review 05/85] ceph: Convert kuids and kgids before printing them Eric W. Biederman
2013-02-13 17:50 ` [PATCH review 06/85] ceph: Enable building when user namespaces are enabled Eric W. Biederman
2013-02-13 17:50 ` [PATCH review 07/85] 9p: Add 'u' and 'g' format specifies for kuids and kgids Eric W. Biederman
2013-02-13 17:50 ` [PATCH review 08/85] 9p: Transmit kuid and kgid values Eric W. Biederman
2013-02-13 17:50 ` [PATCH review 09/85] 9p: Modify the stat structures to use kuid_t and kgid_t Eric W. Biederman
2013-02-13 17:50 ` [PATCH review 10/85] 9p: Modify struct 9p_fid to use a kuid_t not a uid_t Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 11/85] 9p: Modify struct v9fs_session_info to use a kuids and kgids Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 12/85] 9p: Modify v9fs_get_fsgid_for_create to return a kgid Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 13/85] 9p: Allow building 9p with user namespaces enabled Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 14/85] afs: Remove unused structure afs_store_status Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 15/85] afs: Only allow mounting afs in the intial network namespace Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 16/85] afs: Support interacting with multiple user namespaces Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 17/85] coda: Restrict coda messages to the initial pid namespace Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 18/85] coda: Restrict coda messages to the initial user namespace Eric W. Biederman
2013-02-13 18:14 ` Jan Harkes
2013-02-13 18:44 ` Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 19/85] coda: Cache permisions in struct coda_inode_info in a kuid_t Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 20/85] coda: Allow coda to be built when user namespace support is enabled Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 21/85] ocfs2: Handle kuids and kgids in acl/xattr conversions Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 22/85] ocfs2: convert between kuids and kgids and DLM locks Eric W. Biederman
2013-02-14 8:34 ` Joel Becker
2013-02-13 17:51 ` [PATCH review 23/85] ocfs2: Convert uid and gids between in core and on disk inodes Eric W. Biederman
2013-02-14 8:35 ` Joel Becker
2013-02-14 9:10 ` Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 24/85] ocfs2: For tracing report the uid and gid values in the initial user namespace Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 25/85] ocfs2: Compare kuids and kgids using uid_eq and gid_eq Eric W. Biederman
2013-02-14 8:37 ` Joel Becker
2013-02-13 17:51 ` [PATCH review 26/85] ocfs2: Enable building with user namespaces enabled Eric W. Biederman
2013-02-14 8:38 ` Joel Becker
2013-02-13 17:51 ` [PATCH review 27/85] gfs2: Remove improper checks in gfs2_set_dqblk Eric W. Biederman
2013-02-13 17:51 ` Eric W. Biederman [this message]
2013-02-13 17:51 ` [PATCH review 29/85] gfs2: Report quotas in the caller's user namespace Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 30/85] gfs2: Introduce qd2index Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 31/85] gfs2: Modify struct gfs2_quota_change_host to use struct kqid Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 32/85] gfs2: Modify qdsb_get to take a " Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 33/85] gfs2: Convert gfs2_quota_refresh to take a kqid Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 34/85] gfs2: Store qd_id in struct gfs2_quota_data as a struct kqid Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 35/85] gfs2: Remove the QUOTA_USER and QUOTA_GROUP defines Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 36/85] gfs2: Use kuid_t and kgid_t types where appropriate Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 37/85] gfs2: Use uid_eq and gid_eq " Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 38/85] gfs2: Convert uids and gids between dinodes and vfs inodes Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 39/85] gfs2: Enable building with user namespaces enabled Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 40/85] ncpfs: Support interacting with multiple user namespaces Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 41/85] nfs_common: Update the translation between nfsv3 acls linux posix acls Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 42/85] sunrpc: Use userns friendly constants Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 43/85] sunrpc: Use kuid_t and kgid_t where appropriate Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 44/85] sunrpc: Use uid_eq and gid_eq " Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 45/85] sunrpc: Simplify auth_unix now that everything is a kgid_t Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 46/85] sunrpc: Convert kuids and kgids to uids and gids for printing Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 47/85] sunrpc: Use gid_valid to test for gid != INVALID_GID Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 48/85] sunrpc: Update gss uid to security context mapping Eric W. Biederman
2013-02-13 20:35 ` J. Bruce Fields
2013-02-13 21:17 ` Eric W. Biederman
2013-02-13 21:24 ` J. Bruce Fields
2013-02-13 17:51 ` [PATCH review 49/85] sunrpc: Update svcgss xdr handle to rpsec_contect cache Eric W. Biederman
2013-03-04 14:12 ` J. Bruce Fields
2013-03-04 17:11 ` Eric W. Biederman
2013-03-05 23:10 ` J. Bruce Fields
2013-03-05 23:43 ` Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 50/85] sunrpc: Hash uids by first computing their value in the initial userns Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 51/85] sunrpc: Properly encode kuids and kgids in RPC_AUTH_UNIX credentials Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 52/85] sunrpc: Properly encode kuids and kgids in auth.unix.gid rpc pipe upcalls Eric W. Biederman
2013-02-13 21:05 ` J. Bruce Fields
2013-02-13 21:29 ` Eric W. Biederman
2013-02-13 21:50 ` J. Bruce Fields
2013-02-13 22:32 ` Eric W. Biederman
2013-02-13 22:58 ` J. Bruce Fields
2013-02-13 23:22 ` Eric W. Biederman
2013-02-14 7:12 ` Stanislav Kinsbursky
2013-02-14 8:42 ` Eric W. Biederman
2013-02-15 17:00 ` J. Bruce Fields
2013-02-15 18:47 ` Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 53/85] sunrpc: Properly decode kuids and kgids in RPC_AUTH_UNIX credentials Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 54/85] nfs: Pass GLOBAL_ROOT_UID and GLOBAL_ROOT_GID to keyring alloc Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 55/85] nfs: Convert struct nfs_fattr to Use kuid_t and kgid_t Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 56/85] nfs: Convert idmap to use kuids and kgids Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 57/85] nfs: Convert nfs2xdr " Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 58/85] nfs: Convert nfs3xdr " Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 59/85] nfs: Convert nfs4xdr " Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 60/85] nfs: kuid and kgid conversions for nfs/inode.c Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 61/85] nfs: Enable building with user namespaces enabled Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 62/85] nfsd: Remove declaration of nonexistent nfs4_acl_permisison Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 63/85] nfsd: idmap use u32 not uid_t as the intermediate type Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 64/85] nfsd: Convert idmap to use kuids and kgids Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 65/85] nfsd: Remove nfsd_luid, nfsd_lgid, nfsd_ruid and nfsd_rgid Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 66/85] nfsd: Convert nfs3xdr to use kuids and kgids Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 67/85] nfsd: Convert nfsxdr " Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 68/85] nfsd: Handle kuids and kgids in the nfs4acl to posix_acl conversion Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 69/85] nfsd: Modify nfsd4_cb_sec to use kuids and kgids Eric W. Biederman
2013-02-13 17:51 ` [PATCH review 70/85] nfsd: Store ex_anon_uid and ex_anon_gid as " Eric W. Biederman
2013-02-13 17:52 ` [PATCH review 71/85] nfsd: Properly compare and initialize " Eric W. Biederman
2013-02-13 17:52 ` [PATCH review 72/85] nfsd: Enable building with user namespaces enabled Eric W. Biederman
2013-02-13 17:52 ` [PATCH review 73/85] cifs: Override unmappable incoming uids and gids Eric W. Biederman
2013-02-13 17:52 ` [PATCH review 74/85] cifs: Use BUILD_BUG_ON to validate uids and gids are the same size Eric W. Biederman
2013-02-13 17:52 ` [PATCH review 75/85] cifs: Pass GLOBAL_ROOT_UID and GLOBAL_ROOT_GID to keyring_alloc Eric W. Biederman
2013-02-13 17:52 ` [PATCH review 76/85] cifs: Use kuids and kgids SID to uid/gid mapping Eric W. Biederman
2013-02-13 17:52 ` [PATCH review 77/85] cifs: Convert from a kuid before printing current_fsuid Eric W. Biederman
2013-02-13 17:52 ` [PATCH review 78/85] cifs: Modify struct cifs_unix_set_info_args to hold a kuid_t and a kgid_t Eric W. Biederman
2013-02-13 17:52 ` [PATCH review 79/85] cifs: Convert struct tcon_link to use a kuid Eric W. Biederman
2013-02-13 17:52 ` [PATCH review 80/85] cifs: Convert struct cifs_fattr to use kuid and kgids Eric W. Biederman
2013-02-13 17:52 ` [PATCH review 81/85] cifs: Convert struct cifsFileInfo to use a kuid Eric W. Biederman
2013-02-13 17:52 ` [PATCH review 82/85] cifs: Modify struct smb_vol to use kuids and kgids Eric W. Biederman
2013-02-13 17:52 ` [PATCH review 83/85] cifs: Convert struct cifs_sb_info " Eric W. Biederman
2013-02-13 17:52 ` [PATCH review 84/85] cifs: Convert struct cifs_ses to use a kuid_t and a kgid_t Eric W. Biederman
2013-02-13 17:52 ` [PATCH review 85/85] cifs: Enable building with user namespaces enabled Eric W. Biederman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1360777934-5663-28-git-send-email-ebiederm@xmission.com \
--to=ebiederm@xmission.com \
--cc=containers@lists.linux-foundation.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=serge@hallyn.com \
--cc=swhiteho@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®