d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify mode_t check treatment (suggested by trasz).

Browse Source 
By semantical view, trasz's code is better than prior one.

Submitted by:	trasz
Reviewed by:	Masanori OZAWA <ozawa@ongs.co.jp>
This commit is contained in:
Daichi GOTO 2008-11-25 03:49:41 +00:00
parent 1e5da15a63
commit 16385727ce
1 changed files with 2 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
sys/fs/unionfs/union_vfsops.c
View File

@ -66,43 +66,6 @@ static vfs_extattrctl_t unionfs_extattrctl;
static struct vfsops unionfs_vfsops;
/*
* Exchange from userland file mode to vmode.
*/
static u_short
mode2vmode(mode_t mode)
{
u_short ret;
ret = 0;
/* other */
if (mode & S_IXOTH)
ret |= VEXEC >> 6;
if (mode & S_IWOTH)
ret |= VWRITE >> 6;
if (mode & S_IROTH)
ret |= VREAD >> 6;
/* group */
if (mode & S_IXGRP)
ret |= VEXEC >> 3;
if (mode & S_IWGRP)
ret |= VWRITE >> 3;
if (mode & S_IRGRP)
ret |= VREAD >> 3;
/* owner */
if (mode & S_IXUSR)
ret |= VEXEC;
if (mode & S_IWUSR)
ret |= VWRITE;
if (mode & S_IRUSR)
ret |= VREAD;
return (ret);
}
/*
* Mount unionfs layer.
*/
@ -174,7 +137,7 @@ unionfs_domount(struct mount *mp, struct thread *td)
vfs_mount_error(mp, "Invalid udir");
return (EINVAL);
}
udir = mode2vmode(udir);
udir &= S_IRWXU | S_IRWXG | S_IRWXO;
}
if (vfs_getopt(mp->mnt_optnew, "ufile", (void **)&tmp, NULL) == 0) {
if (tmp != NULL)
@ -183,7 +146,7 @@ unionfs_domount(struct mount *mp, struct thread *td)
vfs_mount_error(mp, "Invalid ufile");
return (EINVAL);
}
ufile = mode2vmode(ufile);
ufile &= S_IRWXU | S_IRWXG | S_IRWXO;
}
/* check umask, uid and gid */
if (udir == 0 && ufile != 0)