Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c06b5d6 authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

gfs2: Use kuid_t and kgid_t types where appropriate. 



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

fs/gfs2/inode.c

+2 −1
Original line number Diff line number Diff line
@@ -1580,7 +1580,8 @@ static int setattr_chown(struct inode *inode, struct iattr *attr) 
{

	struct gfs2_inode *ip = GFS2_I(inode);

	struct gfs2_sbd *sdp = GFS2_SB(inode);

	u32 ouid, ogid, nuid, ngid;

	kuid_t ouid, nuid;

	kgid_t ogid, ngid;

	int error;



	ouid = inode->i_uid;

fs/gfs2/quota.c

+4 −4
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ static void qdsb_put(struct gfs2_quota_data *qd) 
	qd_put(qd);

}



int gfs2_quota_hold(struct gfs2_inode *ip, u32 uid, u32 gid)

int gfs2_quota_hold(struct gfs2_inode *ip, kuid_t uid, kgid_t gid)

{

	struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);

	struct gfs2_quota_data **qd;
@@ -918,7 +918,7 @@ static int do_glock(struct gfs2_quota_data *qd, int force_refresh, 
	return error;

}



int gfs2_quota_lock(struct gfs2_inode *ip, u32 uid, u32 gid)

int gfs2_quota_lock(struct gfs2_inode *ip, kuid_t uid, kgid_t gid)

{

	struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);

	struct gfs2_quota_data *qd;
@@ -1039,7 +1039,7 @@ static int print_message(struct gfs2_quota_data *qd, char *type) 
	return 0;

}



int gfs2_quota_check(struct gfs2_inode *ip, u32 uid, u32 gid)

int gfs2_quota_check(struct gfs2_inode *ip, kuid_t uid, kgid_t gid)

{

	struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);

	struct gfs2_quota_data *qd;
@@ -1088,7 +1088,7 @@ int gfs2_quota_check(struct gfs2_inode *ip, u32 uid, u32 gid) 
}



void gfs2_quota_change(struct gfs2_inode *ip, s64 change,

		       u32 uid, u32 gid)

		       kuid_t uid, kgid_t gid)

{

	struct gfs2_quota_data *qd;

	unsigned int x;

fs/gfs2/quota.h

+4 −4
Original line number Diff line number Diff line
@@ -17,15 +17,15 @@ struct shrink_control; 
#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 int gfs2_quota_hold(struct gfs2_inode *ip, kuid_t uid, kgid_t gid);

extern void gfs2_quota_unhold(struct gfs2_inode *ip);



extern int gfs2_quota_lock(struct gfs2_inode *ip, u32 uid, u32 gid);

extern int gfs2_quota_lock(struct gfs2_inode *ip, kuid_t uid, kgid_t gid);

extern void gfs2_quota_unlock(struct gfs2_inode *ip);



extern int gfs2_quota_check(struct gfs2_inode *ip, u32 uid, u32 gid);

extern int gfs2_quota_check(struct gfs2_inode *ip, kuid_t uid, kgid_t gid);

extern void gfs2_quota_change(struct gfs2_inode *ip, s64 change,

			      u32 uid, u32 gid);

			      kuid_t uid, kgid_t gid);



extern int gfs2_quota_sync(struct super_block *sb, int type);

extern int gfs2_quota_refresh(struct gfs2_sbd *sdp, struct kqid qid);