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; }