From 69df827903a1ece2a2b04f37b269a0d8e7096a9c Mon Sep 17 00:00:00 2001
From: Jens Axboe <jaxboe@fusionio.com>
Date: Thu, 3 Jun 2010 12:44:30 +0200
Subject: [PATCH] --- yaml --- r: 199911 b: refs/heads/master c:
 6a6ca57de92fcae34603551ac944aa74758c30d4 h: refs/heads/master i:   199909:
 4ddc5e3d3a3cf649ce5b0d6edc9ac5234018957d   199907:
 c2100a7d1e056de8a294cf6508a81c3c939a49b4   199903:
 40f958f28bf3d3e82f7ed05860432305b37c4487 v: v3

---
 [refs]          | 2 +-
 trunk/fs/pipe.c | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index d872844267fc..881f5112225a 100644
--- 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
index 541d6626f9d9..369a0245aab6 100644
--- 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;
 		}