Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 139160
b: refs/heads/master
c: 851a039
h: refs/heads/master
v: v3
  • Loading branch information
Hugh Dickins authored and Linus Torvalds committed Apr 1, 2009
1 parent 10d8ac5 commit e46c22d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 56a76f8275c379ed73c8a43cfa1dfa2f5e9cfa19
refs/heads/master: 851a039cc547b33b8139fe6d7c2bbfb158e2724e
8 changes: 4 additions & 4 deletions trunk/fs/sysfs/bin.c
Original file line number Diff line number Diff line change
Expand Up @@ -234,23 +234,23 @@ static int bin_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
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 bin_buffer *bb = file->private_data;
struct sysfs_dirent *attr_sd = file->f_path.dentry->d_fsdata;
int ret;

if (!bb->vm_ops)
return -EINVAL;
return VM_FAULT_SIGBUS;

if (!bb->vm_ops->page_mkwrite)
return 0;

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);
return ret;
Expand Down

0 comments on commit e46c22d

Please sign in to comment.