]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - fs/fuse/file.c
mm: page_mkwrite change prototype to match fault
[linux-2.6-omap-h63xx.git] / fs / fuse / file.c
index d9fdb7cec5388756720374f9b4c70ec56d453bb2..4e340fedf768e92a1f3c60e8e2cd8621a7ecb87f 100644 (file)
@@ -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;
 }