mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-28 12:57:57 +00:00
Code Issues Releases Wiki Activity

sysctl: Remove dead CTL_PRINT|_SHOW code

Browse Source 
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Pavel Emelyanov 2015-01-27 16:18:27 +03:00
parent 58b3ef0e6f
commit 1bbc994ccf
3 changed files with 13 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sysctl.h
View File

@ -12,8 +12,6 @@ extern int sysctl_op(struct sysctl_req *req, int op);
enum { enum {
CTL_READ, CTL_READ,
CTL_WRITE, CTL_WRITE,
CTL_PRINT,
CTL_SHOW,
}; };
#define CTL_SHIFT 4 /* Up to 16 types */ #define CTL_SHIFT 4 /* Up to 16 types */

2
ipc_ns.c
View File

@ -908,8 +908,6 @@ static int prepare_ipc_var(int pid)
return -EFAULT; return -EFAULT;
} }
ipc_sysctl_req(var, CTL_PRINT);
ret = ipc_sysctl_req(var, CTL_WRITE); ret = ipc_sysctl_req(var, CTL_WRITE);
ipc_var_entry__free_unpacked(var, NULL); ipc_var_entry__free_unpacked(var, NULL);

83
sysctl.c
View File

@ -18,14 +18,6 @@ do { \
__ret = sysctl_write_##__type(__fd, __req, \ __ret = sysctl_write_##__type(__fd, __req, \
(__type *)(__req)->arg, \ (__type *)(__req)->arg, \
__nr); \ __nr); \
else if (__op == CTL_PRINT) \
__ret = sysctl_print_##__type(__fd, __req, \
(__type *)(__req)->arg, \
__nr); \
else if (__op == CTL_PRINT) \
__ret = sysctl_show_##__type(__fd, __req, \
(__type *)(__req)->arg, \
__nr); \
else \ else \
__ret = -1; \ __ret = -1; \
} while (0) } while (0)
@ -99,37 +91,6 @@ err: \
return ret; \ return ret; \
} }
#define GEN_SYSCTL_PRINT_FUNC(__type, __fmt) \
static int sysctl_print_##__type(int fd, \
struct sysctl_req *req, \
__type *arg, \
int nr) \
{ \
char msg[PAGE_SIZE]; \
int i, off = 0; \
for (i = 0; i < nr; i++) \
off += snprintf(msg + off, sizeof(msg) - off, \
__fmt, arg[i]); \
pr_info("sysctl: <%s> = <%s>\n", req->name, msg); \
\
return 0; \
}
#define GEN_SYSCTL_SHOW_FUNC(__type, __fmt) \
static int sysctl_show_##__type(int fd, \
struct sysctl_req *req, \
__type *arg, \
int nr) \
{ \
int i; \
pr_msg("sysctl: <%s> = <", req->name); \
for (i = 0; i < nr; i++) \
pr_msg(__fmt, arg[i]); \
pr_msg(">\n"); \
\
return 0; \
}
GEN_SYSCTL_READ_FUNC(u32, strtoul); GEN_SYSCTL_READ_FUNC(u32, strtoul);
GEN_SYSCTL_READ_FUNC(u64, strtoull); GEN_SYSCTL_READ_FUNC(u64, strtoull);
GEN_SYSCTL_READ_FUNC(s32, strtol); GEN_SYSCTL_READ_FUNC(s32, strtol);
@ -138,16 +99,6 @@ GEN_SYSCTL_WRITE_FUNC(u32, "%u ");
GEN_SYSCTL_WRITE_FUNC(u64, "%"PRIu64" "); GEN_SYSCTL_WRITE_FUNC(u64, "%"PRIu64" ");
GEN_SYSCTL_WRITE_FUNC(s32, "%d "); GEN_SYSCTL_WRITE_FUNC(s32, "%d ");
GEN_SYSCTL_PRINT_FUNC(u32, "%u ");
GEN_SYSCTL_PRINT_FUNC(u64, "%"PRIu64" ");
GEN_SYSCTL_PRINT_FUNC(char, "%c");
GEN_SYSCTL_PRINT_FUNC(s32, "%d ");
GEN_SYSCTL_SHOW_FUNC(u32, "%u ");
GEN_SYSCTL_SHOW_FUNC(u64, "%"PRIu64" ");
GEN_SYSCTL_SHOW_FUNC(char, "%c");
GEN_SYSCTL_SHOW_FUNC(s32, "%d ");
static int static int
sysctl_write_char(int fd, struct sysctl_req *req, char *arg, int nr) sysctl_write_char(int fd, struct sysctl_req *req, char *arg, int nr)
{ {
@ -177,23 +128,17 @@ err:
static int __sysctl_op(int dir, struct sysctl_req *req, int op) static int __sysctl_op(int dir, struct sysctl_req *req, int op)
{ {
int fd = -1; int fd, ret = -1, nr = 1, flags;
int ret = -1;
int nr = 1;
if (dir >= 0) { if (op == CTL_READ)
int flags; flags = O_RDONLY;
else
flags = O_WRONLY;
if (op == CTL_READ) fd = openat(dir, req->name, flags);
flags = O_RDONLY; if (fd < 0) {
else pr_perror("Can't open sysctl %s", req->name);
flags = O_WRONLY; return -1;
fd = openat(dir, req->name, flags);
if (fd < 0) {
pr_perror("Can't open sysctl %s", req->name);
return -1;
}
} }
switch (CTL_TYPE(req->type)) { switch (CTL_TYPE(req->type)) {
@ -226,12 +171,10 @@ int sysctl_op(struct sysctl_req *req, int op)
int ret = 0; int ret = 0;
int dir = -1; int dir = -1;
if (op != CTL_PRINT && op != CTL_SHOW) { dir = open("/proc/sys", O_RDONLY);
dir = open("/proc/sys", O_RDONLY); if (dir < 0) {
if (dir < 0) { pr_perror("Can't open sysctl dir");
pr_perror("Can't open sysctl dir"); return -1;
return -1;
}
} }
while (req->name) { while (req->name) {