The patch titled Subject: proc: pass "fd" by value in /proc/*/{fd,fdinfo} code has been added to the -mm tree. Its filename is proc-pass-fd-by-value-in-proc-fdfdinfo-code.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Alexey Dobriyan <adobriyan@xxxxxxxxx> Subject: 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@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/proc/base.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff -puN fs/proc/base.c~proc-pass-fd-by-value-in-proc-fdfdinfo-code fs/proc/base.c --- a/fs/proc/base.c~proc-pass-fd-by-value-in-proc-fdfdinfo-code +++ a/fs/proc/base.c @@ -1834,7 +1834,7 @@ static const struct dentry_operations ti 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; @@ -1898,7 +1898,7 @@ static struct dentry *proc_lookupfd_comm 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: @@ -1950,7 +1950,7 @@ static int proc_readfd_common(struct fil 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(); @@ -2370,7 +2370,7 @@ static const struct inode_operations pro 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); _ Subject: Subject: proc: pass "fd" by value in /proc/*/{fd,fdinfo} code Patches currently in -mm which might be from adobriyan@xxxxxxxxx are kstrtox-mark-const-init-data-with-__initconst-instead-of-__initdata.patch proc-clean-up-proc-pid-environ-handling.patch proc-unify-ptrace_may_access-locking-code.patch proc-remove-mm_for_maps.patch proc-use-mm_access-instead-of-ptrace_may_access.patch proc-dont-do-dummy-rcu_read_lock-rcu_read_unlock-on-error-path.patch proc-pass-fd-by-value-in-proc-fdfdinfo-code.patch proc-use-is_err_or_null.patch syscalls-x86-add-__nr_kcmp-syscall-v8.patch c-r-procfs-add-arg_start-end-env_start-end-and-exit_code-members-to-proc-pid-stat.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html