xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

kernel: mount flag is int not ulong, reduce size of Mount struct by putting mflag field in what would be wasted as padding

Browse source
This commit is contained in:
cinap_lenrek 2015-08-09 21:35:50 +02:00
parent 9f4eac5292
commit b4f56f1f4e
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sys/src/9/port/portdat.h
View file

@ -254,11 +254,11 @@ enum
struct Mount struct Mount
{ {
ulong mountid; ulong mountid;
int mflag;
Mount* next; Mount* next;
Mount* order; Mount* order;
Chan* to; /* channel replacing channel */ Chan* to; /* channel replacing channel */
int mflag; char* spec;
char *spec;
}; };
struct Mhead struct Mhead

14
sys/src/9/port/sysfile.c
View file

@ -1002,7 +1002,7 @@ syschdir(va_list list)
} }
long long
bindmount(int ismount, int fd, int afd, char* arg0, char* arg1, ulong flag, char* spec) bindmount(int ismount, int fd, int afd, char* arg0, char* arg1, int flag, char* spec)
{ {
int ret; int ret;
Chan *c0, *c1, *ac, *bc; Chan *c0, *c1, *ac, *bc;
@ -1074,11 +1074,11 @@ uintptr
sysbind(va_list list) sysbind(va_list list)
{ {
char *arg0, *arg1; char *arg0, *arg1;
ulong flag; int flag;
arg0 = va_arg(list, char*); arg0 = va_arg(list, char*);
arg1 = va_arg(list, char*); arg1 = va_arg(list, char*);
flag = va_arg(list, ulong); flag = va_arg(list, int);
return (uintptr)bindmount(0, -1, -1, arg0, arg1, flag, nil); return (uintptr)bindmount(0, -1, -1, arg0, arg1, flag, nil);
} }
@ -1086,13 +1086,13 @@ uintptr
sysmount(va_list list) sysmount(va_list list)
{ {
char *arg1, *spec; char *arg1, *spec;
ulong flag; int flag;
int fd, afd; int fd, afd;
fd = va_arg(list, int); fd = va_arg(list, int);
afd = va_arg(list, int); afd = va_arg(list, int);
arg1 = va_arg(list, char*); arg1 = va_arg(list, char*);
flag = va_arg(list, ulong); flag = va_arg(list, int);
spec = va_arg(list, char*); spec = va_arg(list, char*);
return (uintptr)bindmount(1, fd, afd, nil, arg1, flag, spec); return (uintptr)bindmount(1, fd, afd, nil, arg1, flag, spec);
} }
@ -1101,12 +1101,12 @@ uintptr
sys_mount(va_list list) sys_mount(va_list list)
{ {
char *arg1, *spec; char *arg1, *spec;
ulong flag; int flag;
int fd; int fd;
fd = va_arg(list, int); fd = va_arg(list, int);
arg1 = va_arg(list, char*); arg1 = va_arg(list, char*);
flag = va_arg(list, ulong); flag = va_arg(list, int);
spec = va_arg(list, char*); spec = va_arg(list, char*);
return (uintptr)bindmount(1, fd, -1, nil, arg1, flag, spec); return (uintptr)bindmount(1, fd, -1, nil, arg1, flag, spec);
} }