netlink: Rename pid to portid to avoid confusion

It is a frequent mistake to confuse the netlink port identifier with a
process identifier.  Try to reduce this confusion by renaming fields
that hold port identifiers portid instead of pid.

I have carefully avoided changing the structures exported to
userspace to avoid changing the userspace API.

I have successfully built an allyesconfig kernel with this change.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 7 insertions, 7 deletions

diff --git a/net/unix/diag.c b/net/unix/diag.c
index 750b13408449..06748f108a57 100644
--- a/net/unix/diag.c
+++ b/net/unix/diag.c
@@ -110,12 +110,12 @@ static int sk_diag_show_rqlen(struct sock *sk, struct sk_buff *nlskb)
 }
 
 static int sk_diag_fill(struct sock *sk, struct sk_buff *skb, struct unix_diag_req *req,
-                u32 pid, u32 seq, u32 flags, int sk_ino)
+                u32 portid, u32 seq, u32 flags, int sk_ino)
 {
         struct nlmsghdr *nlh;
         struct unix_diag_msg *rep;
 
-        nlh = nlmsg_put(skb, pid, seq, SOCK_DIAG_BY_FAMILY, sizeof(*rep),
+        nlh = nlmsg_put(skb, portid, seq, SOCK_DIAG_BY_FAMILY, sizeof(*rep),
                         flags);
         if (!nlh)
                 return -EMSGSIZE;
@@ -159,7 +159,7 @@ out_nlmsg_trim:
 }
 
 static int sk_diag_dump(struct sock *sk, struct sk_buff *skb, struct unix_diag_req *req,
-                u32 pid, u32 seq, u32 flags)
+                u32 portid, u32 seq, u32 flags)
 {
         int sk_ino;
 
@@ -170,7 +170,7 @@ static int sk_diag_dump(struct sock *sk, struct sk_buff *skb, struct unix_diag_r
         if (!sk_ino)
                 return 0;
 
-        return sk_diag_fill(sk, skb, req, pid, seq, flags, sk_ino);
+        return sk_diag_fill(sk, skb, req, portid, seq, flags, sk_ino);
 }
 
 static int unix_diag_dump(struct sk_buff *skb, struct netlink_callback *cb)
@@ -200,7 +200,7 @@ static int unix_diag_dump(struct sk_buff *skb, struct netlink_callback *cb)
                         if (!(req->udiag_states & (1 << sk->sk_state)))
                                 goto next;
                         if (sk_diag_dump(sk, skb, req,
-                                         NETLINK_CB(cb->skb).pid,
+                                         NETLINK_CB(cb->skb).portid,
                                          cb->nlh->nlmsg_seq,
                                          NLM_F_MULTI) < 0)
                                 goto done;
@@ -267,7 +267,7 @@ again:
         if (!rep)
                 goto out;
 
-        err = sk_diag_fill(sk, rep, req, NETLINK_CB(in_skb).pid,
+        err = sk_diag_fill(sk, rep, req, NETLINK_CB(in_skb).portid,
                            nlh->nlmsg_seq, 0, req->udiag_ino);
         if (err < 0) {
                 nlmsg_free(rep);
@@ -277,7 +277,7 @@ again:
 
                 goto again;
         }
-        err = netlink_unicast(net->diag_nlsk, rep, NETLINK_CB(in_skb).pid,
+        err = netlink_unicast(net->diag_nlsk, rep, NETLINK_CB(in_skb).portid,
                               MSG_DONTWAIT);
         if (err > 0)
                 err = 0;