p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

locking/atomic, kref: Add KREF_INIT() 

Since we need to change the implementation, stop exposing internals.

Provide KREF_INIT() to allow static initialization of struct kref.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Peter Zijlstra 2016-11-14 17:12:23 +01:00 committed by Ingo Molnar
parent 2b0b211134
commit 1e24edca05
5 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/block/drbd/drbd_bitmap.c
View File

@ -1070,7 +1070,7 @@ static int bm_rw(struct drbd_device *device, const unsigned int flags, unsigned
.done = 0, .done = 0,
.flags = flags, .flags = flags,
.error = 0, .error = 0,
.kref = { ATOMIC_INIT(2) }, .kref = KREF_INIT(2),
}; };
if (!get_ldev_if_state(device, D_ATTACHING)) { /* put is in drbd_bm_aio_ctx_destroy() */ if (!get_ldev_if_state(device, D_ATTACHING)) { /* put is in drbd_bm_aio_ctx_destroy() */

2
fs/fuse/fuse_i.h
View File

@ -256,7 +256,7 @@ struct fuse_io_priv {
#define FUSE_IO_PRIV_SYNC(f) \ #define FUSE_IO_PRIV_SYNC(f) \
{ \ { \
.refcnt = { ATOMIC_INIT(1) }, \ .refcnt = KREF_INIT(1), \
.async = 0, \ .async = 0, \
.file = f, \ .file = f, \
} }

2
include/linux/kref.h
View File

@ -24,6 +24,8 @@ struct kref {
atomic_t refcount; atomic_t refcount;
}; };
#define KREF_INIT(n) { .refcount = ATOMIC_INIT(n), }
/** /**
* kref_init - initialize object. * kref_init - initialize object.
* @kref: object in question. * @kref: object in question.

4
init/version.c
View File

@ -23,9 +23,7 @@ int version_string(LINUX_VERSION_CODE);
#endif #endif
struct uts_namespace init_uts_ns = { struct uts_namespace init_uts_ns = {
.kref = { .kref = KREF_INIT(2),
.refcount = ATOMIC_INIT(2),
},
.name = { .name = {
.sysname = UTS_SYSNAME, .sysname = UTS_SYSNAME,
.nodename = UTS_NODENAME, .nodename = UTS_NODENAME,

4
kernel/pid.c
View File

@ -68,9 +68,7 @@ static inline int mk_pid(struct pid_namespace *pid_ns,
* the scheme scales to up to 4 million PIDs, runtime. * the scheme scales to up to 4 million PIDs, runtime.
*/ */
struct pid_namespace init_pid_ns = { struct pid_namespace init_pid_ns = {
.kref = { .kref = KREF_INIT(2),
.refcount = ATOMIC_INIT(2),
},
.pidmap = { .pidmap = {
[ 0 ... PIDMAP_ENTRIES-1] = { ATOMIC_INIT(BITS_PER_PAGE), NULL } [ 0 ... PIDMAP_ENTRIES-1] = { ATOMIC_INIT(BITS_PER_PAGE), NULL }
}, },