The patch titled
Subject: proc: switch struct proc_dir_entry::count to refcount
has been added to the -mm tree. Its filename is
proc-switch-struct-proc_dir_entry-count-to-refcount.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/proc-switch-struct-proc_dir_entry-count-to-refcount.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/proc-switch-struct-proc_dir_entry-count-to-refcount.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/process/submit-checklist.rst 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: switch struct proc_dir_entry::count to refcount
->count is honest reference count unlike ->in_use.
Link: http://lkml.kernel.org/r/20180313174550.GA4332@avx2
Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/proc/generic.c | 4 ++--
fs/proc/internal.h | 5 +++--
fs/proc/root.c | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff -puN fs/proc/generic.c~proc-switch-struct-proc_dir_entry-count-to-refcount fs/proc/generic.c
--- a/fs/proc/generic.c~proc-switch-struct-proc_dir_entry-count-to-refcount
+++ a/fs/proc/generic.c
@@ -423,7 +423,7 @@ static struct proc_dir_entry *__proc_cre
ent->mode = mode;
ent->nlink = nlink;
ent->subdir = RB_ROOT_CACHED;
- atomic_set(&ent->count, 1);
+ refcount_set(&ent->refcnt, 1);
spin_lock_init(&ent->pde_unload_lock);
INIT_LIST_HEAD(&ent->pde_openers);
proc_set_user(ent, (*parent)->uid, (*parent)->gid);
@@ -574,7 +574,7 @@ EXPORT_SYMBOL(proc_set_user);
void pde_put(struct proc_dir_entry *pde)
{
- if (atomic_dec_and_test(&pde->count)) {
+ if (refcount_dec_and_test(&pde->refcnt)) {
proc_free_inum(pde->low_ino);
pde_free(pde);
}
diff -puN fs/proc/internal.h~proc-switch-struct-proc_dir_entry-count-to-refcount fs/proc/internal.h
--- a/fs/proc/internal.h~proc-switch-struct-proc_dir_entry-count-to-refcount
+++ a/fs/proc/internal.h
@@ -11,6 +11,7 @@
#include <linux/proc_fs.h>
#include <linux/proc_ns.h>
+#include <linux/refcount.h>
#include <linux/spinlock.h>
#include <linux/atomic.h>
#include <linux/binfmts.h>
@@ -36,7 +37,7 @@ struct proc_dir_entry {
* negative -> it's going away RSN
*/
atomic_t in_use;
- atomic_t count; /* use count */
+ refcount_t refcnt;
struct list_head pde_openers; /* who did ->open, but not ->release */
/* protects ->pde_openers and all struct pde_opener instances */
spinlock_t pde_unload_lock;
@@ -168,7 +169,7 @@ int proc_readdir_de(struct file *, struc
static inline struct proc_dir_entry *pde_get(struct proc_dir_entry *pde)
{
- atomic_inc(&pde->count);
+ refcount_inc(&pde->refcnt);
return pde;
}
extern void pde_put(struct proc_dir_entry *);
diff -puN fs/proc/root.c~proc-switch-struct-proc_dir_entry-count-to-refcount fs/proc/root.c
--- a/fs/proc/root.c~proc-switch-struct-proc_dir_entry-count-to-refcount
+++ a/fs/proc/root.c
@@ -199,7 +199,7 @@ struct proc_dir_entry proc_root = {
.namelen = 5,
.mode = S_IFDIR | S_IRUGO | S_IXUGO,
.nlink = 2,
- .count = ATOMIC_INIT(1),
+ .refcnt = REFCOUNT_INIT(1),
.proc_iops = &proc_root_inode_operations,
.proc_fops = &proc_root_operations,
.parent = &proc_root,
_
Patches currently in -mm which might be from adobriyan@xxxxxxxxx are
slab-mark-kmalloc-machinery-as-__ro_after_init.patch
slab-fixup-calculate_alignment-argument-type.patch
slab-make-kmalloc_index-return-unsigned-int.patch
slab-make-kmalloc_size-return-unsigned-int.patch
slab-make-create_kmalloc_cache-work-with-32-bit-sizes.patch
slab-make-create_boot_cache-work-with-32-bit-sizes.patch
slab-make-kmem_cache_create-work-with-32-bit-sizes.patch
slab-make-size_index-array-u8.patch
slab-make-size_index_elem-unsigned-int.patch
slub-make-remote_node_defrag_ratio-unsigned-int.patch
slub-make-max_attr_size-unsigned-int.patch
slub-make-red_left_pad-unsigned-int.patch
slub-make-reserved-unsigned-int.patch
slub-make-align-unsigned-int.patch
slub-make-inuse-unsigned-int.patch
slub-make-cpu_partial-unsigned-int.patch
slub-make-offset-unsigned-int.patch
slub-make-object_size-unsigned-int.patch
slub-make-size-unsigned-int.patch
slab-make-kmem_cache_flags-accept-32-bit-object-size.patch
kasan-make-kasan_cache_create-work-with-32-bit-slab-cache-sizes.patch
slab-make-usercopy-region-32-bit.patch
slub-make-slab_index-return-unsigned-int.patch
slub-make-struct-kmem_cache_order_objects-x-unsigned-int.patch
slub-make-size_from_object-return-unsigned-int.patch
slab-use-32-bit-arithmetic-in-freelist_randomize.patch
proc-do-less-stuff-under-pde_unload_lock.patch
proc-move-proc-sysvipc-creation-to-where-it-belongs.patch
proc-faster-open-close-of-files-without-release-hook.patch
proc-randomize-struct-pde_opener.patch
proc-move-struct-pde_opener-to-kmem-cache.patch
proc-account-struct-pde_opener.patch
proc-check-permissions-earlier-for-proc-wchan.patch
proc-use-set_puts-at-proc-wchan.patch
proc-test-proc-self-wchan.patch
proc-test-proc-self-syscall.patch
proc-move-struct-proc_dir_entry-into-kmem-cache.patch
proc-fix-proc-map_files-lookup-some-more.patch
proc-register-filesystem-last.patch
proc-faster-proc-cmdline.patch
proc-do-mmput-asap-for-proc-map_files.patch
proc-revalidate-misc-dentries.patch
proc-test-last-field-of-proc-loadavg.patch
proc-reject-and-as-filenames.patch
proc-switch-struct-proc_dir_entry-count-to-refcount.patch
uts-create-struct-uts_namespace-from-kmem_cache.patch
seq_file-allocate-seq_file-from-kmem_cache.patch
seq_file-account-everything.patch
seq_file-delete-small-value-optimization.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
