diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-30 09:16:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-30 09:16:14 -0700 |
| commit | 003386fff3e02e51cea882e60f7d28290113964c (patch) | |
| tree | 253001a9a0fc609b757362708edc2dcaab9e2a14 /fs/fuse/fuse_i.h | |
| parent | 092405cdb66f060918160ae730640b449ed7b827 (diff) | |
| parent | 51921cb746f56983db5a373ca68deb2b0d3ddf01 (diff) | |
| download | blackbird-obmc-linux-003386fff3e02e51cea882e60f7d28290113964c.tar.gz blackbird-obmc-linux-003386fff3e02e51cea882e60f7d28290113964c.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse
* '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
Diffstat (limited to 'fs/fuse/fuse_i.h')
| -rw-r--r-- | fs/fuse/fuse_i.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h index 2c0d14a86779..8f309f04064e 100644 --- a/fs/fuse/fuse_i.h +++ b/fs/fuse/fuse_i.h @@ -177,6 +177,9 @@ struct fuse_out { /** Zero partially or not copied pages */ unsigned page_zeroing:1; + /** Pages may be replaced with new ones */ + unsigned page_replace:1; + /** Number or arguments */ unsigned numargs; |
