diff options
author | Nick Piggin <npiggin@suse.de> | 2009-03-31 18:23:21 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-01 11:59:14 -0400 |
commit | c2ec175c39f62949438354f603f4aa170846aabb (patch) | |
tree | f2c9bf1bec2deabe2d3a5092405b027637b6ead3 /fs/fuse/file.c | |
parent | c2fdf3a9b2d52842808a8e551b53b55dd9b45030 (diff) |
mm: page_mkwrite change prototype to match fault
Change the page_mkwrite prototype to take a struct vm_fault, and return
VM_FAULT_xxx flags. There should be no functional change.
This makes it possible to return much more detailed error information to
the VM (and also can provide more information eg. virtual_address to the
driver, which might be important in some special cases).
This is required for a subsequent fix. And will also make it easier to
merge page_mkwrite() with fault() in future.
Signed-off-by: Nick Piggin <npiggin@suse.de>
Cc: Chris Mason <chris.mason@oracle.com>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Cc: Miklos Szeredi <miklos@szeredi.hu>
Cc: Steven Whitehouse <swhiteho@redhat.com>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <joel.becker@oracle.com>
Cc: Artem Bityutskiy <dedekind@infradead.org>
Cc: Felix Blyakher <felixb@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/fuse/file.c')
-rw-r--r-- | fs/fuse/file.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 821d10f719bd..4e340fedf768 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c | |||
@@ -1234,8 +1234,9 @@ static void fuse_vma_close(struct vm_area_struct *vma) | |||
1234 | * - sync(2) | 1234 | * - sync(2) |
1235 | * - try_to_free_pages() with order > PAGE_ALLOC_COSTLY_ORDER | 1235 | * - try_to_free_pages() with order > PAGE_ALLOC_COSTLY_ORDER |
1236 | */ | 1236 | */ |
1237 | static int fuse_page_mkwrite(struct vm_area_struct *vma, struct page *page) | 1237 | static int fuse_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) |
1238 | { | 1238 | { |
1239 | struct page *page = vmf->page; | ||
1239 | /* | 1240 | /* |
1240 | * Don't use page->mapping as it may become NULL from a | 1241 | * Don't use page->mapping as it may become NULL from a |
1241 | * concurrent truncate. | 1242 | * concurrent truncate. |