---

yaml --- r: 199911 b: refs/heads/master c: 6a6ca57 h: refs/heads/master i: 199909: 4ddc5e3 199907: c2100a7 199903: 40f958f v: v3
git-mirror · Jun 3, 2010 · 69df827 · 69df827
1 parent 6c2ea6d
commit 69df827
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4ca761577535b2b4d153689ee97342797dfff05
+refs/heads/master: 6a6ca57de92fcae34603551ac944aa74758c30d4
diff --git a/trunk/fs/pipe.c b/trunk/fs/pipe.c
@@ -1181,13 +1181,7 @@ long pipe_fcntl(struct file *file, unsigned int cmd, unsigned long arg)
 		if (!capable(CAP_SYS_ADMIN) && nr_pages > pipe_max_pages) {
 			ret = -EPERM;
 			goto out;
-		}
-
-		/*
-		 * The pipe needs to be at least 2 pages large to
-		 * guarantee POSIX behaviour.
-		 */
-		if (arg < 2) {
+		} else if (nr_pages < 1) {
 			ret = -EINVAL;
 			goto out;
 		}