diff --git a/include/net/sock.h b/include/net/sock.h
index 1e7f124871d2..894c4498b9dc 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -291,6 +291,7 @@ struct sk_filter;
   *    @sk_ack_backlog: current listen backlog
   *    @sk_max_ack_backlog: listen backlog set in listen()
   *    @sk_uid: user id of owner
+  *    @sk_ino: inode number of owner
   *    @sk_prefer_busy_poll: prefer busypolling over softirq processing
   *    @sk_busy_poll_budget: napi processing budget when busypolling
   *    @sk_priority: %SO_PRIORITY setting
@@ -527,6 +528,7 @@ struct sock {
        u32                     sk_ack_backlog;
        u32                     sk_max_ack_backlog;
        kuid_t                  sk_uid;
+       unsigned long           sk_ino;
        spinlock_t              sk_peer_lock;
        int                     sk_bind_phc;
        struct pid              *sk_peer_pid;
@@ -2084,6 +2086,7 @@ static inline void sock_orphan(struct sock *sk)
        sk_set_socket(sk, NULL);
        sk->sk_wq  = NULL;
        /* Note: sk_uid is unchanged. */
+       WRITE_ONCE(sk->sk_ino, 0);
        write_unlock_bh(&sk->sk_callback_lock);
 }
 
@@ -2095,19 +2098,23 @@ static inline void sock_graft(struct sock *sk, struct socket *parent)
        parent->sk = sk;
        sk_set_socket(sk, parent);
        WRITE_ONCE(sk->sk_uid, SOCK_INODE(parent)->i_uid);
+       WRITE_ONCE(sk->sk_ino, SOCK_INODE(parent)->i_ino);
        security_sock_graft(sk, parent);
        write_unlock_bh(&sk->sk_callback_lock);
 }
 
+static inline unsigned long sock_i_ino(const struct sock *sk)
+{
+       /* Paired with WRITE_ONCE() in sock_graft() and sock_orphan() */
+       return READ_ONCE(sk->sk_ino);
+}
+
 static inline kuid_t sk_uid(const struct sock *sk)
 {
        /* Paired with WRITE_ONCE() in sockfs_setattr() */
        return READ_ONCE(sk->sk_uid);
 }
 
-unsigned long __sock_i_ino(struct sock *sk);
-unsigned long sock_i_ino(struct sock *sk);
-
 static inline kuid_t sock_net_uid(const struct net *net, const struct sock *sk)
 {
        return sk ? sk_uid(sk) : make_kuid(net->user_ns, 0);
diff --git a/net/core/sock.c b/net/core/sock.c
index 9a8290fcc35d..02f31f21b4af 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -2787,28 +2787,6 @@ void sock_pfree(struct sk_buff *skb)
 EXPORT_SYMBOL(sock_pfree);
 #endif /* CONFIG_INET */
 
-unsigned long __sock_i_ino(struct sock *sk)
-{
-       unsigned long ino;
-
-       read_lock(&sk->sk_callback_lock);
-       ino = sk->sk_socket ? SOCK_INODE(sk->sk_socket)->i_ino : 0;
-       read_unlock(&sk->sk_callback_lock);
-       return ino;
-}
-EXPORT_SYMBOL(__sock_i_ino);
-
-unsigned long sock_i_ino(struct sock *sk)
-{
-       unsigned long ino;
-
-       local_bh_disable();
-       ino = __sock_i_ino(sk);
-       local_bh_enable();
-       return ino;
-}
-EXPORT_SYMBOL(sock_i_ino);
-
 /*
  * Allocate a skb from the socket's send buffer.
  */
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index ad41c48126e4..a5e6be173f47 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -3556,6 +3556,7 @@ void mptcp_sock_graft(struct sock *sk, struct socket *parent)
        rcu_assign_pointer(sk->sk_wq, &parent->wq);
        sk_set_socket(sk, parent);
        WRITE_ONCE(sk->sk_uid, SOCK_INODE(parent)->i_uid);
+       WRITE_ONCE(sk->sk_ino, SOCK_INODE(parent)->i_ino);
        write_unlock_bh(&sk->sk_callback_lock);
 }
 
diff --git a/net/netlink/diag.c b/net/netlink/diag.c
index 61981e01fd6f..b8e58132e8af 100644
--- a/net/netlink/diag.c
+++ b/net/netlink/diag.c
@@ -168,7 +168,7 @@ static int __netlink_diag_dump(struct sk_buff *skb, struct netlink_callback *cb,
                                 NETLINK_CB(cb->skb).portid,
                                 cb->nlh->nlmsg_seq,
                                 NLM_F_MULTI,
-                                __sock_i_ino(sk)) < 0) {
+                                sock_i_ino(sk)) < 0) {
                        ret = 1;
                        break;
                }