aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Christie <michaelc@cs.wisc.edu>2006-02-01 22:06:56 -0500
committer <jejb@mulgrave.il.steeleye.com>2006-02-04 17:18:09 -0500
commit5b940adf5b341b12dbb94e7cbdb416b35f52017b (patch)
tree8f436052e75128929ffd30b32118f694eea56d10
parent7b7232f3fb5ecd7c30cb52df368070cc5f5ca614 (diff)
[SCSI] iscsi update: pass correct skb to skb_trim
>From da-x@monatomic.org: Wrong skb is passed to skb_trim in iscsi_if_get_stats. Signed-off-by: Mike Christie <michaelc@cs.wisc.edu> Signed-off-by: Alex Aizman <itn780@yahoo.com> Signed-off-by: Dmitry Yusupov <dmitry_yus@yahoo.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
-rw-r--r--drivers/scsi/scsi_transport_iscsi.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index b61868587dca..79ca29ee1aee 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -680,8 +680,7 @@ iscsi_if_send_reply(int pid, int seq, int type, int done, int multi,
680} 680}
681 681
682static int 682static int
683iscsi_if_get_stats(struct iscsi_transport *transport, struct sk_buff *skb, 683iscsi_if_get_stats(struct iscsi_transport *transport, struct nlmsghdr *nlh)
684 struct nlmsghdr *nlh)
685{ 684{
686 struct iscsi_uevent *ev = NLMSG_DATA(nlh); 685 struct iscsi_uevent *ev = NLMSG_DATA(nlh);
687 struct iscsi_stats *stats; 686 struct iscsi_stats *stats;
@@ -732,7 +731,7 @@ iscsi_if_get_stats(struct iscsi_transport *transport, struct sk_buff *skb,
732 stats->custom_length); 731 stats->custom_length);
733 actual_size -= sizeof(*nlhstat); 732 actual_size -= sizeof(*nlhstat);
734 actual_size = NLMSG_LENGTH(actual_size); 733 actual_size = NLMSG_LENGTH(actual_size);
735 skb_trim(skb, NLMSG_ALIGN(actual_size)); 734 skb_trim(skbstat, NLMSG_ALIGN(actual_size));
736 nlhstat->nlmsg_len = actual_size; 735 nlhstat->nlmsg_len = actual_size;
737 736
738 err = iscsi_unicast_skb(conn->z_pdu, skbstat); 737 err = iscsi_unicast_skb(conn->z_pdu, skbstat);
@@ -923,7 +922,7 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
923 err = -EINVAL; 922 err = -EINVAL;
924 break; 923 break;
925 case ISCSI_UEVENT_GET_STATS: 924 case ISCSI_UEVENT_GET_STATS:
926 err = iscsi_if_get_stats(transport, skb, nlh); 925 err = iscsi_if_get_stats(transport, nlh);
927 break; 926 break;
928 default: 927 default:
929 err = -EINVAL; 928 err = -EINVAL;