From b61d403da27a27aec8d6555a56d5586f95cd2a9d Mon Sep 17 00:00:00 2001
From: Jens Axboe <jens.axboe@oracle.com>
Date: Mon, 24 May 2010 19:15:57 +0200
Subject: [PATCH] --- yaml --- r: 199891 b: refs/heads/master c:
 0191f8697bbdfefcd36e7b8dc3eeddfe82893e4b h: refs/heads/master i:   199889:
 2c6a17d9058226e691b13819758892e08378cc4e   199887:
 50fae9b2b44cd63e316aa711652ed0e5e1ab3e12 v: v3

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

diff --git a/[refs] b/[refs]
index f5941535368b..3fbeacb4d2d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e36f724b4ae70e443a7d152929b60059cbfa1a26
+refs/heads/master: 0191f8697bbdfefcd36e7b8dc3eeddfe82893e4b
diff --git a/trunk/fs/pipe.c b/trunk/fs/pipe.c
index d79872eba09a..01ca9fab95fa 100644
--- a/trunk/fs/pipe.c
+++ b/trunk/fs/pipe.c
@@ -1170,7 +1170,7 @@ long pipe_fcntl(struct file *file, unsigned int cmd, unsigned long arg)
 	switch (cmd) {
 	case F_SETPIPE_SZ:
 		if (!capable(CAP_SYS_ADMIN) && arg > pipe_max_pages)
-			return -EINVAL;
+			return -EPERM;
 		/*
 		 * The pipe needs to be at least 2 pages large to
 		 * guarantee POSIX behaviour.