lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 27 Dec 2013 17:26:45 +0800 From: roy.qing.li@...il.com To: netdev@...r.kernel.org Subject: [PATCH net-next] core: remove old parameter for __dst_destroy_metrics_generic From: Li RongQing <roy.qing.li@...il.com> when call __dst_destroy_metrics_generic, we always know who old is, so do not need to pass it. Signed-off-by: Li RongQing <roy.qing.li@...il.com> --- include/net/dst.h | 7 +++---- net/core/dst.c | 5 +++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/net/dst.h b/include/net/dst.h index 77eb53f..7c86f3e 100644 --- a/include/net/dst.h +++ b/include/net/dst.h @@ -119,13 +119,12 @@ static inline bool dst_metrics_read_only(const struct dst_entry *dst) return dst->_metrics & DST_METRICS_READ_ONLY; } -void __dst_destroy_metrics_generic(struct dst_entry *dst, unsigned long old); +void __dst_destroy_metrics_generic(struct dst_entry *dst); static inline void dst_destroy_metrics_generic(struct dst_entry *dst) { - unsigned long val = dst->_metrics; - if (!(val & DST_METRICS_READ_ONLY)) - __dst_destroy_metrics_generic(dst, val); + if (!dst_metrics_read_only(dst)) + __dst_destroy_metrics_generic(dst); } static inline u32 *dst_metrics_write_ptr(struct dst_entry *dst) diff --git a/net/core/dst.c b/net/core/dst.c index ca4231e..f1875ee 100644 --- a/net/core/dst.c +++ b/net/core/dst.c @@ -308,10 +308,11 @@ u32 *dst_cow_metrics_generic(struct dst_entry *dst, unsigned long old) EXPORT_SYMBOL(dst_cow_metrics_generic); /* Caller asserts that dst_metrics_read_only(dst) is false. */ -void __dst_destroy_metrics_generic(struct dst_entry *dst, unsigned long old) +void __dst_destroy_metrics_generic(struct dst_entry *dst) { - unsigned long prev, new; + unsigned long prev, new, old; + old = dst->_metrics; new = ((unsigned long) dst_default_metrics) | DST_METRICS_READ_ONLY; prev = cmpxchg(&dst->_metrics, old, new); if (prev == old) -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists