FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

'atomic_read()' -> refcount_read()'

Browse Source 
The upstream 4.11 kernel, in commit (10383aea2f445bce9b2a2b308def08134b438c8e
"kref: Implement 'struct kref' using refcount_t"), changed refcount type on kref
objects. We now need to use refcount_read to read them.

Signed-off-by: Shaun Ruffell <sruffell@digium.com>
This commit is contained in:
Shaun Ruffell 2017-06-01 12:16:54 -05:00 committed by Tzafrir Cohen
parent ff88ccb1cd
commit 0159b0e7ce
5 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/dahdi/dahdi_dynamic.c
View File

@ -467,7 +467,7 @@ static int _destroy_dynamic(struct dahdi_dynamic_span *dds)
/* We shouldn't have more than the two references at this point. If
* we do, there are probably channels that are still opened. */
if (atomic_read(&d->kref.refcount) > 2) {
if (refcount_read(&d->kref.refcount) > 2) {
dynamic_put(d);
return -EBUSY;
}

2
drivers/dahdi/xpp/xbus-core.c
View File

@ -244,7 +244,7 @@ int refcount_xbus(xbus_t *xbus)
{
struct kref *kref = &xbus->kref;
return atomic_read(&kref->refcount);
return refcount_read(&kref->refcount);
}
/*------------------------- Frame Handling ------------------------*/

2
drivers/dahdi/xpp/xbus-sysfs.c
View File

@ -1000,7 +1000,7 @@ void xbus_sysfs_remove(xbus_t *xbus)
return;
}
XBUS_DBG(DEVICES, xbus, "going to unregister: refcount=%d\n",
atomic_read(&astribank->kobj.kref.refcount));
refcount_read(&astribank->kobj.kref.refcount));
BUG_ON(dev_get_drvdata(astribank) != xbus);
device_unregister(astribank);
dev_set_drvdata(astribank, NULL);

2
drivers/dahdi/xpp/xpp_dahdi.c
View File

@ -124,7 +124,7 @@ int refcount_xpd(xpd_t *xpd)
{
struct kref *kref = &xpd->kref;
return atomic_read(&kref->refcount);
return refcount_read(&kref->refcount);
}
xpd_t *get_xpd(const char *msg, xpd_t *xpd)

3
include/dahdi/kernel.h
View File

@ -1404,6 +1404,8 @@ static inline short dahdi_txtone_nextsample(struct dahdi_chan *ss)
/*! Maximum audio mask */
#define DAHDI_FORMAT_AUDIO_MASK ((1 << 16) - 1)
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
#define refcount_read atomic_read
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 16, 0)
/* DAHDI only was using the xxx_clear_bit variants. */
@ -1533,6 +1535,7 @@ static inline int strcasecmp(const char *s1, const char *s2)
#endif /* 2.6.31 */
#endif /* 3.10.0 */
#endif /* 3.16.0 */
#endif /* 4.11.0 */
#ifndef DEFINE_SPINLOCK
#define DEFINE_SPINLOCK(x) spinlock_t x = SPIN_LOCK_UNLOCKED