---

yaml --- r: 6865 b: refs/heads/master c: bce5f6b h: refs/heads/master i: 6863: 08505f3 v: v3
git-mirror · Sep 5, 2005 · f8b92ec · f8b92ec
1 parent 14cfbec
commit f8b92ec
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 242e54686257493f0b10ac557e730419d9af7d24
+refs/heads/master: bce5f6ba340b09d8b29902add204bb95a6d3d88b
diff --git a/trunk/include/linux/capability.h b/trunk/include/linux/capability.h
@@ -233,6 +233,7 @@ typedef __u32 kernel_cap_t;
 /* Allow enabling/disabling tagged queuing on SCSI controllers and sending
    arbitrary SCSI commands */
 /* Allow setting encryption key on loopback filesystem */
+/* Allow setting zone reclaim policy */
 
 #define CAP_SYS_ADMIN        21
 

diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c
@@ -1375,6 +1375,9 @@ asmlinkage long sys_set_zone_reclaim(unsigned int node, unsigned int zone,
 	struct zone *z;
 	int i;
 
+	if (!capable(CAP_SYS_ADMIN))
+		return -EACCES;
+
 	if (node >= MAX_NUMNODES || !node_online(node))
 		return -EINVAL;