diff options
author | 2005-04-16 15:24:05 -0700 | |
---|---|---|
committer | 2005-04-16 15:24:05 -0700 | |
commit | 79befd0c08c4766f8fa27e37ac2a70e40840a56a (patch) | |
tree | d0600c289b1a54902e3b78eec0729dc7011569a3 /fs/proc | |
parent | [PATCH] filemap_getpage can block when MAP_NONBLOCK specified (diff) | |
download | linux-79befd0c08c4766f8fa27e37ac2a70e40840a56a.tar.gz linux-79befd0c08c4766f8fa27e37ac2a70e40840a56a.tar.bz2 linux-79befd0c08c4766f8fa27e37ac2a70e40840a56a.zip |
[PATCH] oom-killer disable for iscsi/lvm2/multipath userland critical sections
iscsi/lvm2/multipath needs guaranteed protection from the oom-killer, so
make the magical value of -17 in /proc/<pid>/oom_adj defeat the oom-killer
altogether.
(akpm: we still need to document oom_adj and friends in
Documentation/filesystems/proc.txt!)
Signed-off-by: Andrea Arcangeli <andrea@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/proc')
-rw-r--r-- | fs/proc/base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index dad8ea4e00a0..39fd336cfdb9 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -751,7 +751,7 @@ static ssize_t oom_adjust_write(struct file *file, const char __user *buf, if (copy_from_user(buffer, buf, count)) return -EFAULT; oom_adjust = simple_strtol(buffer, &end, 0); - if (oom_adjust < -16 || oom_adjust > 15) + if ((oom_adjust < -16 || oom_adjust > 15) && oom_adjust != OOM_DISABLE) return -EINVAL; if (*end == '\n') end++; |