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

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

9p: Modify struct 9p_fid to use a kuid_t not a uid_t 



Change struct 9p_fid and it's associated functions to
use kuid_t's instead of uid_t.

Cc: Eric Van Hensbergen <ericvh@gmail.com>
Cc: Ron Minnich <rminnich@gmail.com>
Cc: Latchesar Ionkov <lucho@ionkov.net>
Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
parent 447c5094

fs/9p/fid.c

+9 −8
Original line number Diff line number Diff line
@@ -74,19 +74,20 @@ int v9fs_fid_add(struct dentry *dentry, struct p9_fid *fid) 
 *

 */



static struct p9_fid *v9fs_fid_find(struct dentry *dentry, u32 uid, int any)

static struct p9_fid *v9fs_fid_find(struct dentry *dentry, kuid_t uid, int any)

{

	struct v9fs_dentry *dent;

	struct p9_fid *fid, *ret;



	p9_debug(P9_DEBUG_VFS, " dentry: %s (%p) uid %d any %d\n",

		 dentry->d_name.name, dentry, uid, any);

		 dentry->d_name.name, dentry, from_kuid(&init_user_ns, uid),

		 any);

	dent = (struct v9fs_dentry *) dentry->d_fsdata;

	ret = NULL;

	if (dent) {

		spin_lock(&dent->lock);

		list_for_each_entry(fid, &dent->fidlist, dlist) {

			if (any || fid->uid == uid) {

			if (any || uid_eq(fid->uid, uid)) {

				ret = fid;

				break;

			}
@@ -126,7 +127,7 @@ static int build_path_from_dentry(struct v9fs_session_info *v9ses, 
}



static struct p9_fid *v9fs_fid_lookup_with_uid(struct dentry *dentry,

					       uid_t uid, int any)

					       kuid_t uid, int any)

{

	struct dentry *ds;

	char **wnames, *uname;
@@ -233,7 +234,7 @@ static struct p9_fid *v9fs_fid_lookup_with_uid(struct dentry *dentry, 


struct p9_fid *v9fs_fid_lookup(struct dentry *dentry)

{

	uid_t uid;

	kuid_t uid;

	int  any, access;

	struct v9fs_session_info *v9ses;
@@ -253,7 +254,7 @@ struct p9_fid *v9fs_fid_lookup(struct dentry *dentry) 
		break;



	default:

		uid = ~0;

		uid = INVALID_UID;

		any = 0;

		break;

	}
@@ -272,7 +273,7 @@ struct p9_fid *v9fs_fid_clone(struct dentry *dentry) 
	return ret;

}



static struct p9_fid *v9fs_fid_clone_with_uid(struct dentry *dentry, uid_t uid)

static struct p9_fid *v9fs_fid_clone_with_uid(struct dentry *dentry, kuid_t uid)

{

	struct p9_fid *fid, *ret;
@@ -289,7 +290,7 @@ struct p9_fid *v9fs_writeback_fid(struct dentry *dentry) 
	int err;

	struct p9_fid *fid;



	fid = v9fs_fid_clone_with_uid(dentry, 0);

	fid = v9fs_fid_clone_with_uid(dentry, GLOBAL_ROOT_UID);

	if (IS_ERR(fid))

		goto error_out;

	/*

fs/9p/v9fs.c

+1 −1
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ struct p9_fid *v9fs_session_init(struct v9fs_session_info *v9ses, 
	if ((v9ses->flags & V9FS_ACCESS_MASK) == V9FS_ACCESS_SINGLE)

		fid->uid = v9ses->uid;

	else

		fid->uid = ~0;

		fid->uid = INVALID_UID;



#ifdef CONFIG_9P_FSCACHE

	/* register the session for caching */

include/net/9p/client.h

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ struct p9_fid { 
	int mode;

	struct p9_qid qid;

	u32 iounit;

	uid_t uid;

	kuid_t uid;



	void *rdir;