]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
SCSI: iscsi: fix setting of pid from netlink skb
authorMike Christie <michaelc@cs.wisc.edu>
Fri, 27 Jan 2012 03:13:09 +0000 (21:13 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 2 Apr 2012 17:31:54 +0000 (10:31 -0700)
commit df1c7baba1b7b3053950f3845a6575aca47ba9ce upstream.

NETLINK_CREDS's pid now returns 0, so I guess we are supposed to
be using NETLINK_CB. This changed while the patch to export the
pid was getting merged upstream, so it was not noticed until both
the network and iscsi changes were in the same tree.

Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/scsi/scsi_transport_iscsi.c

index cfd491437239750937b7a3d16f5235f6503f158b..e3e3c7d0662d4659563cf89ba535e92b6ea18d3d 100644 (file)
@@ -1941,7 +1941,7 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group)
        switch (nlh->nlmsg_type) {
        case ISCSI_UEVENT_CREATE_SESSION:
                err = iscsi_if_create_session(priv, ep, ev,
-                                             NETLINK_CREDS(skb)->pid,
+                                             NETLINK_CB(skb).pid,
                                              ev->u.c_session.initial_cmdsn,
                                              ev->u.c_session.cmds_max,
                                              ev->u.c_session.queue_depth);
@@ -1954,7 +1954,7 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group)
                }
 
                err = iscsi_if_create_session(priv, ep, ev,
-                                       NETLINK_CREDS(skb)->pid,
+                                       NETLINK_CB(skb).pid,
                                        ev->u.c_bound_session.initial_cmdsn,
                                        ev->u.c_bound_session.cmds_max,
                                        ev->u.c_bound_session.queue_depth);