Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

[pandora-kernel.git] / fs / sysfs / bin.c

diff --git a/fs/sysfs/bin.c b/fs/sysfs/bin.c
index 4e321f7..a475983 100644 (file)
--- a/fs/sysfs/bin.c
+++ b/fs/sysfs/bin.c
@@ -179,30 +179,14 @@ static void bin_vma_open(struct vm_area_struct *vma)
        struct bin_buffer *bb = file->private_data;
        struct sysfs_dirent *attr_sd = file->f_path.dentry->d_fsdata;
 
-       if (!bb->vm_ops || !bb->vm_ops->open)
-               return;
-
-       if (!sysfs_get_active(attr_sd))
-               return;
-
-       bb->vm_ops->open(vma);
-
-       sysfs_put_active(attr_sd);
-}
-
-static void bin_vma_close(struct vm_area_struct *vma)
-{
-       struct file *file = vma->vm_file;
-       struct bin_buffer *bb = file->private_data;
-       struct sysfs_dirent *attr_sd = file->f_path.dentry->d_fsdata;
-
-       if (!bb->vm_ops || !bb->vm_ops->close)
+       if (!bb->vm_ops)
                return;
 
        if (!sysfs_get_active(attr_sd))
                return;
 
-       bb->vm_ops->close(vma);
+       if (bb->vm_ops->open)
+               bb->vm_ops->open(vma);
 
        sysfs_put_active(attr_sd);
 }
@@ -214,13 +198,15 @@ static int bin_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
        struct sysfs_dirent *attr_sd = file->f_path.dentry->d_fsdata;
        int ret;
 
-       if (!bb->vm_ops || !bb->vm_ops->fault)
+       if (!bb->vm_ops)
                return VM_FAULT_SIGBUS;
 
        if (!sysfs_get_active(attr_sd))
                return VM_FAULT_SIGBUS;
 
-       ret = bb->vm_ops->fault(vma, vmf);
+       ret = VM_FAULT_SIGBUS;
+       if (bb->vm_ops->fault)
+               ret = bb->vm_ops->fault(vma, vmf);
 
        sysfs_put_active(attr_sd);
        return ret;
@@ -236,13 +222,12 @@ static int bin_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
        if (!bb->vm_ops)
                return VM_FAULT_SIGBUS;
 
-       if (!bb->vm_ops->page_mkwrite)
-               return 0;
-
        if (!sysfs_get_active(attr_sd))
                return VM_FAULT_SIGBUS;
 
-       ret = bb->vm_ops->page_mkwrite(vma, vmf);
+       ret = 0;
+       if (bb->vm_ops->page_mkwrite)
+               ret = bb->vm_ops->page_mkwrite(vma, vmf);
 
        sysfs_put_active(attr_sd);
        return ret;
@@ -256,13 +241,15 @@ static int bin_access(struct vm_area_struct *vma, unsigned long addr,
        struct sysfs_dirent *attr_sd = file->f_path.dentry->d_fsdata;
        int ret;
 
-       if (!bb->vm_ops || !bb->vm_ops->access)
+       if (!bb->vm_ops)
                return -EINVAL;
 
        if (!sysfs_get_active(attr_sd))
                return -EINVAL;
 
-       ret = bb->vm_ops->access(vma, addr, buf, len, write);
+       ret = -EINVAL;
+       if (bb->vm_ops->access)
+               ret = bb->vm_ops->access(vma, addr, buf, len, write);
 
        sysfs_put_active(attr_sd);
        return ret;
@@ -276,13 +263,15 @@ static int bin_set_policy(struct vm_area_struct *vma, struct mempolicy *new)
        struct sysfs_dirent *attr_sd = file->f_path.dentry->d_fsdata;
        int ret;
 
-       if (!bb->vm_ops || !bb->vm_ops->set_policy)
+       if (!bb->vm_ops)
                return 0;
 
        if (!sysfs_get_active(attr_sd))
                return -EINVAL;
 
-       ret = bb->vm_ops->set_policy(vma, new);
+       ret = 0;
+       if (bb->vm_ops->set_policy)
+               ret = bb->vm_ops->set_policy(vma, new);
 
        sysfs_put_active(attr_sd);
        return ret;
@@ -296,13 +285,15 @@ static struct mempolicy *bin_get_policy(struct vm_area_struct *vma,
        struct sysfs_dirent *attr_sd = file->f_path.dentry->d_fsdata;
        struct mempolicy *pol;
 
-       if (!bb->vm_ops || !bb->vm_ops->get_policy)
+       if (!bb->vm_ops)
                return vma->vm_policy;
 
        if (!sysfs_get_active(attr_sd))
                return vma->vm_policy;
 
-       pol = bb->vm_ops->get_policy(vma, addr);
+       pol = vma->vm_policy;
+       if (bb->vm_ops->get_policy)
+               pol = bb->vm_ops->get_policy(vma, addr);
 
        sysfs_put_active(attr_sd);
        return pol;
@@ -316,13 +307,15 @@ static int bin_migrate(struct vm_area_struct *vma, const nodemask_t *from,
        struct sysfs_dirent *attr_sd = file->f_path.dentry->d_fsdata;
        int ret;
 
-       if (!bb->vm_ops || !bb->vm_ops->migrate)
+       if (!bb->vm_ops)
                return 0;
 
        if (!sysfs_get_active(attr_sd))
                return 0;
 
-       ret = bb->vm_ops->migrate(vma, from, to, flags);
+       ret = 0;
+       if (bb->vm_ops->migrate)
+               ret = bb->vm_ops->migrate(vma, from, to, flags);
 
        sysfs_put_active(attr_sd);
        return ret;
@@ -331,7 +324,6 @@ static int bin_migrate(struct vm_area_struct *vma, const nodemask_t *from,
 
 static const struct vm_operations_struct bin_vm_ops = {
        .open           = bin_vma_open,
-       .close          = bin_vma_close,
        .fault          = bin_fault,
        .page_mkwrite   = bin_page_mkwrite,
        .access         = bin_access,
@@ -377,6 +369,14 @@ static int mmap(struct file *file, struct vm_area_struct *vma)
        if (bb->mmapped && bb->vm_ops != vma->vm_ops)
                goto out_put;
 
+       /*
+        * It is not possible to successfully wrap close.
+        * So error if someone is trying to use close.
+        */
+       rc = -EINVAL;
+       if (vma->vm_ops && vma->vm_ops->close)
+               goto out_put;
+
        rc = 0;
        bb->mmapped = 1;
        bb->vm_ops = vma->vm_ops;