diff options
author | Jens Axboe <jaxboe@fusionio.com> | 2010-06-03 06:44:30 -0400 |
---|---|---|
committer | Jens Axboe <jaxboe@fusionio.com> | 2010-06-03 06:44:30 -0400 |
commit | 6a6ca57de92fcae34603551ac944aa74758c30d4 (patch) | |
tree | 759f741019bdab40da2feecb13991aaa6310f05f | |
parent | b4ca761577535b2b4d153689ee97342797dfff05 (diff) |
pipe: adjust minimum pipe size to 1 page
We don't need to pages to guarantee the POSIX requirement
that upto a page size write must be atomic to an empty
pipe.
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
-rw-r--r-- | fs/pipe.c | 8 |
1 files changed, 1 insertions, 7 deletions
@@ -1181,13 +1181,7 @@ long pipe_fcntl(struct file *file, unsigned int cmd, unsigned long arg) | |||
1181 | if (!capable(CAP_SYS_ADMIN) && nr_pages > pipe_max_pages) { | 1181 | if (!capable(CAP_SYS_ADMIN) && nr_pages > pipe_max_pages) { |
1182 | ret = -EPERM; | 1182 | ret = -EPERM; |
1183 | goto out; | 1183 | goto out; |
1184 | } | 1184 | } else if (nr_pages < 1) { |
1185 | |||
1186 | /* | ||
1187 | * The pipe needs to be at least 2 pages large to | ||
1188 | * guarantee POSIX behaviour. | ||
1189 | */ | ||
1190 | if (arg < 2) { | ||
1191 | ret = -EINVAL; | 1185 | ret = -EINVAL; |
1192 | goto out; | 1186 | goto out; |
1193 | } | 1187 | } |