提交 851a039c 编写于 作者: H Hugh Dickins 提交者: Linus Torvalds

mm: page_mkwrite change prototype to match fault: fix sysfs

Fix warnings and return values in sysfs bin_page_mkwrite(), fixing
fs/sysfs/bin.c: In function `bin_page_mkwrite':
fs/sysfs/bin.c:250: warning: passing argument 2 of `bb->vm_ops->page_mkwrite' from incompatible pointer type
fs/sysfs/bin.c: At top level:
fs/sysfs/bin.c:280: warning: initialization from incompatible pointer type

Expects to have my [PATCH next] sysfs: fix some bin_vm_ops errors
Signed-off-by: NHugh Dickins <hugh@veritas.com>
Cc: Nick Piggin <npiggin@suse.de>
Cc: "Eric W. Biederman" <ebiederm@aristanetworks.com>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 56a76f82
...@@ -234,7 +234,7 @@ static int bin_fault(struct vm_area_struct *vma, struct vm_fault *vmf) ...@@ -234,7 +234,7 @@ static int bin_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
return ret; return ret;
} }
static int bin_page_mkwrite(struct vm_area_struct *vma, struct page *page) static int bin_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
{ {
struct file *file = vma->vm_file; struct file *file = vma->vm_file;
struct bin_buffer *bb = file->private_data; struct bin_buffer *bb = file->private_data;
...@@ -242,15 +242,15 @@ static int bin_page_mkwrite(struct vm_area_struct *vma, struct page *page) ...@@ -242,15 +242,15 @@ static int bin_page_mkwrite(struct vm_area_struct *vma, struct page *page)
int ret; int ret;
if (!bb->vm_ops) if (!bb->vm_ops)
return -EINVAL; return VM_FAULT_SIGBUS;
if (!bb->vm_ops->page_mkwrite) if (!bb->vm_ops->page_mkwrite)
return 0; return 0;
if (!sysfs_get_active_two(attr_sd)) if (!sysfs_get_active_two(attr_sd))
return -EINVAL; return VM_FAULT_SIGBUS;
ret = bb->vm_ops->page_mkwrite(vma, page); ret = bb->vm_ops->page_mkwrite(vma, vmf);
sysfs_put_active_two(attr_sd); sysfs_put_active_two(attr_sd);
return ret; return ret;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册