lkml.org 
[lkml]   [2018]   [Feb]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.2 058/140] usbip: vhci: stop printing kernel pointer addresses in messages
    3.2.100-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Shuah Khan <shuahkh@osg.samsung.com>

    commit 8272d099d05f7ab2776cf56a2ab9f9443be18907 upstream.

    Remove and/or change debug, info. and error messages to not print
    kernel pointer addresses.

    Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    [bwh: Backported to 3.2: adjust filenames, context, indentation]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/staging/usbip/vhci_hcd.c | 10 ----------
    drivers/staging/usbip/vhci_rx.c | 23 +++++++++++------------
    drivers/staging/usbip/vhci_tx.c | 3 ++-
    3 files changed, 13 insertions(+), 23 deletions(-)

    --- a/drivers/staging/usbip/vhci_hcd.c
    +++ b/drivers/staging/usbip/vhci_hcd.c
    @@ -516,9 +516,6 @@ static int vhci_urb_enqueue(struct usb_h
    unsigned long flags;
    struct vhci_device *vdev;

    - usbip_dbg_vhci_hc("enter, usb_hcd %p urb %p mem_flags %d\n",
    - hcd, urb, mem_flags);
    -
    /* patch to usb_sg_init() is in 2.5.60 */
    BUG_ON(!urb->transfer_buffer && urb->transfer_buffer_length);

    @@ -677,8 +674,6 @@ static int vhci_urb_dequeue(struct usb_h
    struct vhci_priv *priv;
    struct vhci_device *vdev;

    - pr_info("dequeue a urb %p\n", urb);
    -
    spin_lock_irqsave(&the_controller->lock, flags);

    priv = urb->hcpriv;
    @@ -707,7 +702,6 @@ static int vhci_urb_dequeue(struct usb_h

    spin_lock_irqsave(&vdev->priv_lock, flags2);

    - pr_info("device %p seems to be disconnected\n", vdev);
    list_del(&priv->list);
    kfree(priv);
    urb->hcpriv = NULL;
    @@ -719,8 +713,6 @@ static int vhci_urb_dequeue(struct usb_h
    * vhci_rx will receive RET_UNLINK and give back the URB.
    * Otherwise, we give back it here.
    */
    - pr_info("gives back urb %p\n", urb);
    -
    usb_hcd_unlink_urb_from_ep(hcd, urb);

    spin_unlock_irqrestore(&the_controller->lock, flags);
    @@ -751,8 +743,6 @@ static int vhci_urb_dequeue(struct usb_h

    unlink->unlink_seqnum = priv->seqnum;

    - pr_info("device %p seems to be still connected\n", vdev);
    -
    /* send cmd_unlink and try to cancel the pending URB in the
    * peer */
    list_add_tail(&unlink->list, &vdev->unlink_tx);
    --- a/drivers/staging/usbip/vhci_rx.c
    +++ b/drivers/staging/usbip/vhci_rx.c
    @@ -35,21 +35,19 @@ struct urb *pickup_urb_and_free_priv(str
    urb = priv->urb;
    status = urb->status;

    - usbip_dbg_vhci_rx("find urb %p vurb %p seqnum %u\n",
    - urb, priv, seqnum);
    + usbip_dbg_vhci_rx("find urb seqnum %u\n", seqnum);

    /* TODO: fix logic here to improve indent situtation */
    if (status != -EINPROGRESS) {
    if (status == -ENOENT ||
    status == -ECONNRESET)
    - dev_info(&urb->dev->dev,
    - "urb %p was unlinked "
    - "%ssynchronuously.\n", urb,
    - status == -ENOENT ? "" : "a");
    + dev_dbg(&urb->dev->dev,
    + "urb seq# %u was unlinked %ssynchronuously\n",
    + seqnum, status == -ENOENT ? "" : "a");
    else
    - dev_info(&urb->dev->dev,
    - "urb %p may be in a error, "
    - "status %d\n", urb, status);
    + dev_dbg(&urb->dev->dev,
    + "urb seq# %u may be in a error, status %d\n",
    + seqnum, status);
    }

    list_del(&priv->list);
    @@ -75,8 +73,8 @@ static void vhci_recv_ret_submit(struct
    spin_unlock(&vdev->priv_lock);

    if (!urb) {
    - pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
    - pr_info("max seqnum %d\n",
    + pr_err("cannot find a urb of seqnum %u max seqnum %d\n",
    + pdu->base.seqnum,
    atomic_read(&the_controller->seqnum));
    usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
    return;
    @@ -99,7 +97,7 @@ static void vhci_recv_ret_submit(struct
    if (usbip_dbg_flag_vhci_rx)
    usbip_dump_urb(urb);

    - usbip_dbg_vhci_rx("now giveback urb %p\n", urb);
    + usbip_dbg_vhci_rx("now giveback urb %u\n", pdu->base.seqnum);

    spin_lock_irqsave(&the_controller->lock, flags);
    usb_hcd_unlink_urb_from_ep(vhci_to_hcd(the_controller), urb);
    @@ -165,7 +163,7 @@ static void vhci_recv_ret_unlink(struct
    pr_info("the urb (seqnum %d) was already given backed\n",
    pdu->base.seqnum);
    } else {
    - usbip_dbg_vhci_rx("now giveback urb %p\n", urb);
    + usbip_dbg_vhci_rx("now giveback urb %d\n", pdu->base.seqnum);

    /* If unlink is succeed, status is -ECONNRESET */
    urb->status = pdu->u.ret_unlink.status;
    --- a/drivers/staging/usbip/vhci_tx.c
    +++ b/drivers/staging/usbip/vhci_tx.c
    @@ -83,7 +83,8 @@ static int vhci_send_cmd_submit(struct v
    memset(&msg, 0, sizeof(msg));
    memset(&iov, 0, sizeof(iov));

    - usbip_dbg_vhci_tx("setup txdata urb %p\n", urb);
    + usbip_dbg_vhci_tx("setup txdata urb seqnum %lu\n",
    + priv->seqnum);

    /* 1. setup usbip_header */
    setup_cmd_submit_pdu(&pdu_header, urb);
    \
     
     \ /
      Last update: 2018-02-28 16:44    [W:4.233 / U:0.140 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site