lkml.org 
[lkml]   [2012]   [Apr]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 2/2] proc: pass "fd" by value in /proc/*/{fd,fdinfo} code
    Pass "fd" directly, not via pointer -- one less memory read.

    Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
    ---

    fs/proc/base.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    --- a/fs/proc/base.c
    +++ b/fs/proc/base.c
    @@ -1836,7 +1836,7 @@ static const struct dentry_operations tid_fd_dentry_operations =
    static struct dentry *proc_fd_instantiate(struct inode *dir,
    struct dentry *dentry, struct task_struct *task, const void *ptr)
    {
    - unsigned fd = *(const unsigned *)ptr;
    + unsigned fd = (unsigned long)ptr;
    struct file *file;
    struct files_struct *files;
    struct inode *inode;
    @@ -1900,7 +1900,7 @@ static struct dentry *proc_lookupfd_common(struct inode *dir,
    if (fd == ~0U)
    goto out;

    - result = instantiate(dir, dentry, task, &fd);
    + result = instantiate(dir, dentry, task, (void *)(unsigned long)fd);
    out:
    put_task_struct(task);
    out_no_task:
    @@ -1952,7 +1952,7 @@ static int proc_readfd_common(struct file * filp, void * dirent,
    len = snprintf(name, sizeof(name), "%d", fd);
    rv = proc_fill_cache(filp, dirent, filldir,
    name, len, instantiate, p,
    - &fd);
    + (void *)(unsigned long)fd);
    if (rv < 0)
    goto out_fd_loop;
    rcu_read_lock();
    @@ -2375,7 +2375,7 @@ static const struct inode_operations proc_fd_inode_operations = {
    static struct dentry *proc_fdinfo_instantiate(struct inode *dir,
    struct dentry *dentry, struct task_struct *task, const void *ptr)
    {
    - unsigned fd = *(unsigned *)ptr;
    + unsigned fd = (unsigned long)ptr;
    struct inode *inode;
    struct proc_inode *ei;
    struct dentry *error = ERR_PTR(-ENOENT);

    \
     
     \ /
      Last update: 2012-04-07 21:05    [W:0.023 / U:93.612 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site