Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

[linux-2.6-microblaze.git] / fs / proc / inode.c

diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index 28d6105..bde6b6f 100644 (file)
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -297,6 +297,21 @@ static loff_t proc_reg_llseek(struct file *file, loff_t offset, int whence)
        return rv;
 }
 
+static ssize_t proc_reg_read_iter(struct kiocb *iocb, struct iov_iter *iter)
+{
+       struct proc_dir_entry *pde = PDE(file_inode(iocb->ki_filp));
+       ssize_t ret;
+
+       if (pde_is_permanent(pde))
+               return pde->proc_ops->proc_read_iter(iocb, iter);
+
+       if (!use_pde(pde))
+               return -EIO;
+       ret = pde->proc_ops->proc_read_iter(iocb, iter);
+       unuse_pde(pde);
+       return ret;
+}
+
 static ssize_t pde_read(struct proc_dir_entry *pde, struct file *file, char __user *buf, size_t count, loff_t *ppos)
 {
        typeof_member(struct proc_ops, proc_read) read;
@@ -572,9 +587,19 @@ static const struct file_operations proc_reg_file_ops = {
        .write          = proc_reg_write,
        .poll           = proc_reg_poll,
        .unlocked_ioctl = proc_reg_unlocked_ioctl,
-#ifdef CONFIG_COMPAT
-       .compat_ioctl   = proc_reg_compat_ioctl,
-#endif
+       .mmap           = proc_reg_mmap,
+       .get_unmapped_area = proc_reg_get_unmapped_area,
+       .open           = proc_reg_open,
+       .release        = proc_reg_release,
+};
+
+static const struct file_operations proc_iter_file_ops = {
+       .llseek         = proc_reg_llseek,
+       .read_iter      = proc_reg_read_iter,
+       .write          = proc_reg_write,
+       .splice_read    = generic_file_splice_read,
+       .poll           = proc_reg_poll,
+       .unlocked_ioctl = proc_reg_unlocked_ioctl,
        .mmap           = proc_reg_mmap,
        .get_unmapped_area = proc_reg_get_unmapped_area,
        .open           = proc_reg_open,
@@ -582,12 +607,27 @@ static const struct file_operations proc_reg_file_ops = {
 };
 
 #ifdef CONFIG_COMPAT
-static const struct file_operations proc_reg_file_ops_no_compat = {
+static const struct file_operations proc_reg_file_ops_compat = {
        .llseek         = proc_reg_llseek,
        .read           = proc_reg_read,
        .write          = proc_reg_write,
        .poll           = proc_reg_poll,
        .unlocked_ioctl = proc_reg_unlocked_ioctl,
+       .compat_ioctl   = proc_reg_compat_ioctl,
+       .mmap           = proc_reg_mmap,
+       .get_unmapped_area = proc_reg_get_unmapped_area,
+       .open           = proc_reg_open,
+       .release        = proc_reg_release,
+};
+
+static const struct file_operations proc_iter_file_ops_compat = {
+       .llseek         = proc_reg_llseek,
+       .read_iter      = proc_reg_read_iter,
+       .splice_read    = generic_file_splice_read,
+       .write          = proc_reg_write,
+       .poll           = proc_reg_poll,
+       .unlocked_ioctl = proc_reg_unlocked_ioctl,
+       .compat_ioctl   = proc_reg_compat_ioctl,
        .mmap           = proc_reg_mmap,
        .get_unmapped_area = proc_reg_get_unmapped_area,
        .open           = proc_reg_open,
@@ -619,42 +659,51 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
 {
        struct inode *inode = new_inode(sb);
 
-       if (inode) {
-               inode->i_ino = de->low_ino;
-               inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
-               PROC_I(inode)->pde = de;
+       if (!inode) {
+               pde_put(de);
+               return NULL;
+       }
 
-               if (is_empty_pde(de)) {
-                       make_empty_dir_inode(inode);
-                       return inode;
-               }
-               if (de->mode) {
-                       inode->i_mode = de->mode;
-                       inode->i_uid = de->uid;
-                       inode->i_gid = de->gid;
-               }
-               if (de->size)
-                       inode->i_size = de->size;
-               if (de->nlink)
-                       set_nlink(inode, de->nlink);
+       inode->i_ino = de->low_ino;
+       inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
+       PROC_I(inode)->pde = de;
+       if (is_empty_pde(de)) {
+               make_empty_dir_inode(inode);
+               return inode;
+       }
 
-               if (S_ISREG(inode->i_mode)) {
-                       inode->i_op = de->proc_iops;
+       if (de->mode) {
+               inode->i_mode = de->mode;
+               inode->i_uid = de->uid;
+               inode->i_gid = de->gid;
+       }
+       if (de->size)
+               inode->i_size = de->size;
+       if (de->nlink)
+               set_nlink(inode, de->nlink);
+
+       if (S_ISREG(inode->i_mode)) {
+               inode->i_op = de->proc_iops;
+               if (de->proc_ops->proc_read_iter)
+                       inode->i_fop = &proc_iter_file_ops;
+               else
                        inode->i_fop = &proc_reg_file_ops;
 #ifdef CONFIG_COMPAT
-                       if (!de->proc_ops->proc_compat_ioctl) {
-                               inode->i_fop = &proc_reg_file_ops_no_compat;
-                       }
+               if (de->proc_ops->proc_compat_ioctl) {
+                       if (de->proc_ops->proc_read_iter)
+                               inode->i_fop = &proc_iter_file_ops_compat;
+                       else
+                               inode->i_fop = &proc_reg_file_ops_compat;
+               }
 #endif
-               } else if (S_ISDIR(inode->i_mode)) {
-                       inode->i_op = de->proc_iops;
-                       inode->i_fop = de->proc_dir_ops;
-               } else if (S_ISLNK(inode->i_mode)) {
-                       inode->i_op = de->proc_iops;
-                       inode->i_fop = NULL;
-               } else
-                       BUG();
-       } else
-              pde_put(de);
+       } else if (S_ISDIR(inode->i_mode)) {
+               inode->i_op = de->proc_iops;
+               inode->i_fop = de->proc_dir_ops;
+       } else if (S_ISLNK(inode->i_mode)) {
+               inode->i_op = de->proc_iops;
+               inode->i_fop = NULL;
+       } else {
+               BUG();
+       }
        return inode;
 }