X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=fs%2Ffuse%2Ffile.c;h=4e340fedf768e92a1f3c60e8e2cd8621a7ecb87f;hb=c2ec175c39f62949438354f603f4aa170846aabb;hp=d9fdb7cec5388756720374f9b4c70ec56d453bb2;hpb=d0807323345f1cd8ab578b09aab04d10862e9414;p=linux-2.6-omap-h63xx.git

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index d9fdb7cec53..4e340fedf76 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)
  * - sync(2)
  * - try_to_free_pages() with order > PAGE_ALLOC_COSTLY_ORDER
  */
-static int fuse_page_mkwrite(struct vm_area_struct *vma, struct page *page)
+static int fuse_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
+	struct page *page = vmf->page;
 	/*
 	 * Don't use page->mapping as it may become NULL from a
 	 * concurrent truncate.
@@ -1465,7 +1466,7 @@ static loff_t fuse_file_llseek(struct file *file, loff_t offset, int origin)
 	case SEEK_END:
 		retval = fuse_update_attributes(inode, NULL, file, NULL);
 		if (retval)
-			return retval;
+			goto exit;
 		offset += i_size_read(inode);
 		break;
 	case SEEK_CUR:
@@ -1479,6 +1480,7 @@ static loff_t fuse_file_llseek(struct file *file, loff_t offset, int origin)
 		}
 		retval = offset;
 	}
+exit:
 	mutex_unlock(&inode->i_mutex);
 	return retval;
 }