git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
OMAP3: clock: fix enable bit used for dpll4_m4x2 clock
[sfrench/cifs-2.6.git]
/
kernel
/
sysctl_binary.c
diff --git
a/kernel/sysctl_binary.c
b/kernel/sysctl_binary.c
index 8f5d16e0707a403bac2f30887e3b43538328c825..8cd50d8f9bde4c2d2ce403736aa33c9b769f35c9 100644
(file)
--- a/
kernel/sysctl_binary.c
+++ b/
kernel/sysctl_binary.c
@@
-1331,7
+1331,7
@@
static ssize_t binary_sysctl(const int *name, int nlen,
ssize_t result;
char *pathname;
int flags;
ssize_t result;
char *pathname;
int flags;
- int acc_mode
, fmode
;
+ int acc_mode;
pathname = sysctl_getname(name, nlen, &table);
result = PTR_ERR(pathname);
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;
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;
} 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;
} else if (oldval && oldlen) {
flags = O_RDONLY;
acc_mode = MAY_READ;
- fmode = FMODE_READ;
} else {
result = 0;
goto out_putname;
} 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;
if (result)
goto out_putname;
- result = may_open(&nd.path, acc_mode, f
mode
);
+ result = may_open(&nd.path, acc_mode, f
lags
);
if (result)
goto out_putpath;
if (result)
goto out_putpath;