Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9dae3497 authored Aug 06, 2018 by Yafang Shao Committed by David S. Miller Aug 06, 2018

net: avoid unnecessary sock_flag() check when enable timestamp



The sock_flag() check is alreay inside sock_enable_timestamp(), so it is
unnecessary checking it in the caller.

    void sock_enable_timestamp(struct sock *sk, int flag)
    {
        if (!sock_flag(sk, flag)) {
            ...
        }
    }

Signed-off-by: Yafang Shao <laoar.shao@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 429711ae

net/compat.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -466,7 +466,6 @@ int compat_sock_get_timestamp(struct sock sk, struct timeval __user userstamp)

		ctv = (struct compat_timeval __user *) userstamp;
		err = -ENOENT;
		if (!sock_flag(sk, SOCK_TIMESTAMP))
		sock_enable_timestamp(sk, SOCK_TIMESTAMP);
		tv = ktime_to_timeval(sk->sk_stamp);
		if (tv.tv_sec == -1)
		@@ -494,7 +493,6 @@ int compat_sock_get_timestampns(struct sock sk, struct timespec __user usersta

		ctv = (struct compat_timespec __user *) userstamp;
		err = -ENOENT;
		if (!sock_flag(sk, SOCK_TIMESTAMP))
		sock_enable_timestamp(sk, SOCK_TIMESTAMP);
		ts = ktime_to_timespec(sk->sk_stamp);
		if (ts.tv_sec == -1)

net/core/sock.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -2900,7 +2900,7 @@ EXPORT_SYMBOL(lock_sock_fast);
		int sock_get_timestamp(struct sock sk, struct timeval __user userstamp)
		{
		struct timeval tv;
		if (!sock_flag(sk, SOCK_TIMESTAMP))

		sock_enable_timestamp(sk, SOCK_TIMESTAMP);
		tv = ktime_to_timeval(sk->sk_stamp);
		if (tv.tv_sec == -1)
		@@ -2916,7 +2916,7 @@ EXPORT_SYMBOL(sock_get_timestamp);
		int sock_get_timestampns(struct sock sk, struct timespec __user userstamp)
		{
		struct timespec ts;
		if (!sock_flag(sk, SOCK_TIMESTAMP))

		sock_enable_timestamp(sk, SOCK_TIMESTAMP);
		ts = ktime_to_timespec(sk->sk_stamp);
		if (ts.tv_sec == -1)