mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-20 21:51:05 +00:00
Switch may_open() and break_lease() to passing O_...
... instead of mixing FMODE_ and O_ Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
d208bbdda9
commit
8737c9305b
8 changed files with 18 additions and 21 deletions
|
@ -1331,7 +1331,7 @@ static ssize_t binary_sysctl(const int *name, int nlen,
|
|||
ssize_t result;
|
||||
char *pathname;
|
||||
int flags;
|
||||
int acc_mode, fmode;
|
||||
int acc_mode;
|
||||
|
||||
pathname = sysctl_getname(name, nlen, &table);
|
||||
result = PTR_ERR(pathname);
|
||||
|
@ -1342,15 +1342,12 @@ static ssize_t binary_sysctl(const int *name, int nlen,
|
|||
if (oldval && oldlen && newval && newlen) {
|
||||
flags = O_RDWR;
|
||||
acc_mode = MAY_READ | MAY_WRITE;
|
||||
fmode = FMODE_READ | FMODE_WRITE;
|
||||
} else if (newval && newlen) {
|
||||
flags = O_WRONLY;
|
||||
acc_mode = MAY_WRITE;
|
||||
fmode = FMODE_WRITE;
|
||||
} else if (oldval && oldlen) {
|
||||
flags = O_RDONLY;
|
||||
acc_mode = MAY_READ;
|
||||
fmode = FMODE_READ;
|
||||
} else {
|
||||
result = 0;
|
||||
goto out_putname;
|
||||
|
@ -1361,7 +1358,7 @@ static ssize_t binary_sysctl(const int *name, int nlen,
|
|||
if (result)
|
||||
goto out_putname;
|
||||
|
||||
result = may_open(&nd.path, acc_mode, fmode);
|
||||
result = may_open(&nd.path, acc_mode, flags);
|
||||
if (result)
|
||||
goto out_putpath;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue