linux-stable.git/fs/pipe.c, branch linux-2.6.36.y

Un-inline get_pipe_info() helper function

2010-12-09T21:33:36+00:00

commit 72083646528d4887b920deb71b37e09bc7d227bb upstream.

This avoids some include-file hell, and the function isn't really
important enough to be inlined anyway.

Reported-by: Ingo Molnar 
Signed-off-by: Linus Torvalds 
Signed-off-by: Greg Kroah-Hartman

Export 'get_pipe_info()' to other users

2010-12-09T21:33:36+00:00

commit c66fb347946ebdd5b10908866ecc9fa05ee2cf3d upstream.

And in particular, use it in 'pipe_fcntl()'.

The other pipe functions do not need to use the 'careful' version, since
they are only ever called for things that are already known to be pipes.

The normal read/write/ioctl functions are called through the file
operations structures, so if a file isn't a pipe, they'd never get
called.  But pipe_fcntl() is special, and called directly from the
generic fcntl code, and needs to use the same careful function that the
splice code is using.

Cc: Jens Axboe 
Cc: Andrew Morton 
Cc: Al Viro 
Cc: Dave Jones 
Signed-off-by: Linus Torvalds 
Signed-off-by: Greg Kroah-Hartman

pipe: fix failure to return error code on ->confirm()

2010-11-22T19:03:06+00:00

commit e5953cbdff26f7cbae7eff30cd9b18c4e19b7594 upstream.

The arguments were transposed, we want to assign the error code to
'ret', which is being returned.

Signed-off-by: Nicolas Kaiser 
Signed-off-by: Jens Axboe 
Signed-off-by: Greg Kroah-Hartman

pipe: fix check in "set size" fcntl

2010-06-10T17:08:34+00:00

As it stands this check compares the number of pages to the page size.
This makes no sense and makes the fcntl fail in almost any sane case.

Fix it by checking if nr_pages is not zero (it can become zero only if
arg is too big and round_pipe_size() overflows).

Signed-off-by: Miklos Szeredi 
Signed-off-by: Jens Axboe

pipe: fix pipe buffer resizing

2010-06-10T17:08:34+00:00

pipe_set_size() needs to copy pipe bufs from the old circular buffer
to the new.

The current code gets this wrong in multiple ways, resulting in oops.

Test program is available here:
  http://www.kernel.org/pub/linux/kernel/people/mszeredi/piperesize/

Signed-off-by: Miklos Szeredi 
Signed-off-by: Jens Axboe

pipe: change /proc/sys/fs/pipe-max-pages to byte sized interface

2010-06-03T12:54:39+00:00

This changes the interface to be based on bytes instead. The API
matches that of F_SETPIPE_SZ in that it rounds up the passed in
size so that the resulting page array is a power-of-2 in size.

The proc file is renamed to /proc/sys/fs/pipe-max-size to
reflect this change.

Signed-off-by: Jens Axboe

pipe: change the privilege required for growing a pipe beyond system max

2010-06-03T10:45:28+00:00

Change it to CAP_SYS_RESOURCE, as that more accurately models what
we want to control.

Suggested-by: Michael Kerrisk 
Signed-off-by: Jens Axboe

pipe: adjust minimum pipe size to 1 page

2010-06-03T10:44:30+00:00

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

Merge branch 'master' into for-linus

2010-06-01T10:42:12+00:00

Conflicts:
	fs/pipe.c

Signed-off-by: Jens Axboe

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse

2010-05-30T16:16:14+00:00

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  mm: export generic_pipe_buf_*() to modules
  fuse: support splice() reading from fuse device
  fuse: allow splice to move pages
  mm: export remove_from_page_cache() to modules
  mm: export lru_cache_add_*() to modules
  fuse: support splice() writing to fuse device
  fuse: get page reference for readpages
  fuse: use get_user_pages_fast()
  fuse: remove unneeded variable