Piteball/android_kernel_samsung_msm8976
1
1
Fork 0
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git synced 2024-09-21 03:43:03 +00:00
Code Issues Projects Releases Wiki Activity

cifs: Convert struct tcon_link to use a kuid.

Browse source 
Cc: Steve French <smfrench@gmail.com>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
This commit is contained in:
Eric W. Biederman 2013-02-06 01:48:56 -08:00
parent 49418b2c28
commit 6d4a083205
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs/cifs/cifsglob.h
View file

@ -837,7 +837,7 @@ struct cifs_tcon {
*/ */
struct tcon_link { struct tcon_link {
struct rb_node tl_rbnode; struct rb_node tl_rbnode;
uid_t tl_uid; kuid_t tl_uid;
unsigned long tl_flags; unsigned long tl_flags;
#define TCON_LINK_MASTER 0 #define TCON_LINK_MASTER 0
#define TCON_LINK_PENDING 1 #define TCON_LINK_PENDING 1

12
fs/cifs/connect.c
View file

@ -3919,7 +3919,7 @@ cifs_set_vol_auth(struct smb_vol *vol, struct cifs_ses *ses)
} }
static struct cifs_tcon * static struct cifs_tcon *
cifs_construct_tcon(struct cifs_sb_info *cifs_sb, uid_t fsuid) cifs_construct_tcon(struct cifs_sb_info *cifs_sb, kuid_t fsuid)
{ {
int rc; int rc;
struct cifs_tcon *master_tcon = cifs_sb_master_tcon(cifs_sb); struct cifs_tcon *master_tcon = cifs_sb_master_tcon(cifs_sb);
@ -3989,7 +3989,7 @@ cifs_sb_tcon_pending_wait(void *unused)
/* find and return a tlink with given uid */ /* find and return a tlink with given uid */
static struct tcon_link * static struct tcon_link *
tlink_rb_search(struct rb_root *root, uid_t uid) tlink_rb_search(struct rb_root *root, kuid_t uid)
{ {
struct rb_node *node = root->rb_node; struct rb_node *node = root->rb_node;
struct tcon_link *tlink; struct tcon_link *tlink;
@ -3997,9 +3997,9 @@ tlink_rb_search(struct rb_root *root, uid_t uid)
while (node) { while (node) {
tlink = rb_entry(node, struct tcon_link, tl_rbnode); tlink = rb_entry(node, struct tcon_link, tl_rbnode);
if (tlink->tl_uid > uid) if (uid_gt(tlink->tl_uid, uid))
node = node->rb_left; node = node->rb_left;
else if (tlink->tl_uid < uid) else if (uid_lt(tlink->tl_uid, uid))
node = node->rb_right; node = node->rb_right;
else else
return tlink; return tlink;
@ -4018,7 +4018,7 @@ tlink_rb_insert(struct rb_root *root, struct tcon_link *new_tlink)
tlink = rb_entry(*new, struct tcon_link, tl_rbnode); tlink = rb_entry(*new, struct tcon_link, tl_rbnode);
parent = *new; parent = *new;
if (tlink->tl_uid > new_tlink->tl_uid) if (uid_gt(tlink->tl_uid, new_tlink->tl_uid))
new = &((*new)->rb_left); new = &((*new)->rb_left);
else else
new = &((*new)->rb_right); new = &((*new)->rb_right);
@ -4048,7 +4048,7 @@ struct tcon_link *
cifs_sb_tlink(struct cifs_sb_info *cifs_sb) cifs_sb_tlink(struct cifs_sb_info *cifs_sb)
{ {
int ret; int ret;
uid_t fsuid = current_fsuid(); kuid_t fsuid = current_fsuid();
struct tcon_link *tlink, *newtlink; struct tcon_link *tlink, *newtlink;
if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MULTIUSER)) if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MULTIUSER))