Merge branch 'work.splice' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[sfrench/cifs-2.6.git] / kernel / relay.c
index 9b48284eac56b0e033fea99046925e87c9ef4c67..39a9dfc69486b57a85d115dcefee75d35907a74d 100644 (file)
@@ -39,10 +39,10 @@ static void relay_file_mmap_close(struct vm_area_struct *vma)
 /*
  * fault() vm_op implementation for relay file mapping.
  */
-static int relay_buf_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+static int relay_buf_fault(struct vm_fault *vmf)
 {
        struct page *page;
-       struct rchan_buf *buf = vma->vm_private_data;
+       struct rchan_buf *buf = vmf->vma->vm_private_data;
        pgoff_t pgoff = vmf->pgoff;
 
        if (!buf)
@@ -847,7 +847,7 @@ void relay_close(struct rchan *chan)
 
        if (chan->last_toobig)
                printk(KERN_WARNING "relay: one or more items not logged "
-                      "[item size (%Zd) > sub-buffer size (%Zd)]\n",
+                      "[item size (%zd) > sub-buffer size (%zd)]\n",
                       chan->last_toobig, chan->subbuf_size);
 
        list_del(&chan->list);