The patch titled sunrpc: assign PDE->data before gluing PDE into /proc tree has been removed from the -mm tree. Its filename was sunrpc-assign-pde-data-before-gluing-pde-into-proc-tree.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: sunrpc: assign PDE->data before gluing PDE into /proc tree From: "Denis V. Lunev" <den@xxxxxxxxxx> Simply replace proc_create and further data assigned with proc_create_data. Signed-off-by: Denis V. Lunev <den@xxxxxxxxxx> Cc: Alexey Dobriyan <adobriyan@xxxxxxxxxx> Cc: Eric W. Biederman <ebiederm@xxxxxxxxxxxx> Cc: Trond Myklebust <trond.myklebust@xxxxxxxxxx> Cc: "J. Bruce Fields" <bfields@xxxxxxxxxxxx> Cc: Neil Brown <neilb@xxxxxxx> Cc: "David S. Miller" <davem@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- net/sunrpc/cache.c | 15 ++++++--------- net/sunrpc/stats.c | 8 +------- 2 files changed, 7 insertions(+), 16 deletions(-) diff -puN net/sunrpc/cache.c~sunrpc-assign-pde-data-before-gluing-pde-into-proc-tree net/sunrpc/cache.c --- a/net/sunrpc/cache.c~sunrpc-assign-pde-data-before-gluing-pde-into-proc-tree +++ a/net/sunrpc/cache.c @@ -316,31 +316,28 @@ static int create_cache_proc_entries(str cd->proc_ent->owner = cd->owner; cd->channel_ent = cd->content_ent = NULL; - p = proc_create("flush", S_IFREG|S_IRUSR|S_IWUSR, - cd->proc_ent, &cache_flush_operations); + p = proc_create_data("flush", S_IFREG|S_IRUSR|S_IWUSR, + cd->proc_ent, &cache_flush_operations, cd); cd->flush_ent = p; if (p == NULL) goto out_nomem; p->owner = cd->owner; - p->data = cd; if (cd->cache_request || cd->cache_parse) { - p = proc_create("channel", S_IFREG|S_IRUSR|S_IWUSR, - cd->proc_ent, &cache_file_operations); + p = proc_create_data("channel", S_IFREG|S_IRUSR|S_IWUSR, + cd->proc_ent, &cache_file_operations, cd); cd->channel_ent = p; if (p == NULL) goto out_nomem; p->owner = cd->owner; - p->data = cd; } if (cd->cache_show) { - p = proc_create("content", S_IFREG|S_IRUSR|S_IWUSR, - cd->proc_ent, &content_file_operations); + p = proc_create_data("content", S_IFREG|S_IRUSR|S_IWUSR, + cd->proc_ent, &content_file_operations, cd); cd->content_ent = p; if (p == NULL) goto out_nomem; p->owner = cd->owner; - p->data = cd; } return 0; out_nomem: diff -puN net/sunrpc/stats.c~sunrpc-assign-pde-data-before-gluing-pde-into-proc-tree net/sunrpc/stats.c --- a/net/sunrpc/stats.c~sunrpc-assign-pde-data-before-gluing-pde-into-proc-tree +++ a/net/sunrpc/stats.c @@ -224,16 +224,10 @@ EXPORT_SYMBOL_GPL(rpc_print_iostats); static inline struct proc_dir_entry * do_register(const char *name, void *data, const struct file_operations *fops) { - struct proc_dir_entry *ent; - rpc_proc_init(); dprintk("RPC: registering /proc/net/rpc/%s\n", name); - ent = proc_create(name, 0, proc_net_rpc, fops); - if (ent) { - ent->data = data; - } - return ent; + return proc_create_data(name, 0, proc_net_rpc, fops, data); } struct proc_dir_entry * _ Patches currently in -mm which might be from den@xxxxxxxxxx are origin.patch git-net.patch powerpc-assign-pde-data-before-gluing-pde-into-proc-tree.patch proc-use-non-racy-method-for-proc-page_owner-creation-page_owner.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