From patchwork Thu Mar 28 17:37:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bandan Das X-Patchwork-Id: 10875577 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C6D501669 for ; Thu, 28 Mar 2019 17:39:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ABE81287AE for ; Thu, 28 Mar 2019 17:39:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A002E28CC7; Thu, 28 Mar 2019 17:39:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 53188287AE for ; Thu, 28 Mar 2019 17:39:01 +0000 (UTC) Received: from localhost ([127.0.0.1]:39773 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h9YzU-0006HX-HB for patchwork-qemu-devel@patchwork.kernel.org; Thu, 28 Mar 2019 13:39:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35382) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h9Yy9-0005Em-Mx for qemu-devel@nongnu.org; Thu, 28 Mar 2019 13:37:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h9Yy8-0000iD-9M for qemu-devel@nongnu.org; Thu, 28 Mar 2019 13:37:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57050) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h9Yy7-0000gc-T8 for qemu-devel@nongnu.org; Thu, 28 Mar 2019 13:37:36 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B453930992B5; Thu, 28 Mar 2019 17:37:32 +0000 (UTC) Received: from gigantic.usersys.redhat.com (helium.bos.redhat.com [10.18.17.132]) by smtp.corp.redhat.com (Postfix) with ESMTP id 45F971001DD1; Thu, 28 Mar 2019 17:37:32 +0000 (UTC) From: Bandan Das To: qemu-devel@nongnu.org Date: Thu, 28 Mar 2019 13:37:21 -0400 Message-Id: <20190328173722.26465-2-bsd@redhat.com> In-Reply-To: <20190328173722.26465-1-bsd@redhat.com> References: <20190328173722.26465-1-bsd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Thu, 28 Mar 2019 17:37:32 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/2 v3] usb-mtp: remove usb_mtp_object_free_one X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, kraxel@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP This function is used in the delete path only and can be replaced by a call to usb_mtp_object_free. Reviewed-by: Peter Maydell Signed-off-by: Bandan Das --- hw/usb/dev-mtp.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index 91b820baaf..4dc1317e2e 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -1150,16 +1150,6 @@ enum { DELETE_PARTIAL = (DELETE_FAILURE | DELETE_SUCCESS), }; -/* Assumes that children, if any, have been already freed */ -static void usb_mtp_object_free_one(MTPState *s, MTPObject *o) -{ - assert(o->nchildren == 0); - QTAILQ_REMOVE(&s->objects, o, next); - g_free(o->name); - g_free(o->path); - g_free(o); -} - static int usb_mtp_deletefn(MTPState *s, MTPObject *o, uint32_t trans) { MTPObject *iter, *iter2; @@ -1181,14 +1171,14 @@ static int usb_mtp_deletefn(MTPState *s, MTPObject *o, uint32_t trans) if (remove(o->path)) { ret |= DELETE_FAILURE; } else { - usb_mtp_object_free_one(s, o); + usb_mtp_object_free(s, o); ret |= DELETE_SUCCESS; } } else if (o->format == FMT_ASSOCIATION) { if (rmdir(o->path)) { ret |= DELETE_FAILURE; } else { - usb_mtp_object_free_one(s, o); + usb_mtp_object_free(s, o); ret |= DELETE_SUCCESS; } } From patchwork Thu Mar 28 17:37:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bandan Das X-Patchwork-Id: 10875579 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 52E821874 for ; Thu, 28 Mar 2019 17:39:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 38277287AE for ; Thu, 28 Mar 2019 17:39:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2CB6928CC7; Thu, 28 Mar 2019 17:39:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id AA2E828BCB for ; Thu, 28 Mar 2019 17:39:02 +0000 (UTC) Received: from localhost ([127.0.0.1]:39775 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h9YzV-0006IE-V1 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 28 Mar 2019 13:39:02 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35391) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h9YyA-0005F0-28 for qemu-devel@nongnu.org; Thu, 28 Mar 2019 13:37:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h9Yy8-0000i6-7D for qemu-devel@nongnu.org; Thu, 28 Mar 2019 13:37:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51000) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h9Yy7-0000gm-Qd for qemu-devel@nongnu.org; Thu, 28 Mar 2019 13:37:36 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 51BE730FE5CD; Thu, 28 Mar 2019 17:37:33 +0000 (UTC) Received: from gigantic.usersys.redhat.com (helium.bos.redhat.com [10.18.17.132]) by smtp.corp.redhat.com (Postfix) with ESMTP id D41521001E69; Thu, 28 Mar 2019 17:37:32 +0000 (UTC) From: Bandan Das To: qemu-devel@nongnu.org Date: Thu, 28 Mar 2019 13:37:22 -0400 Message-Id: <20190328173722.26465-3-bsd@redhat.com> In-Reply-To: <20190328173722.26465-1-bsd@redhat.com> References: <20190328173722.26465-1-bsd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Thu, 28 Mar 2019 17:37:33 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/2 v3] usb-mtp: refactor the flow of usb_mtp_write_data X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, kraxel@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP There's no functional change but the flow is (hopefully) more consistent for both file and folder object types. Signed-off-by: Bandan Das --- hw/usb/dev-mtp.c | 57 +++++++++++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 27 deletions(-) diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index 4dc1317e2e..0afb926719 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -1599,7 +1599,7 @@ static int usb_mtp_update_object(MTPObject *parent, char *name) return ret; } -static int usb_mtp_write_data(MTPState *s) +static void usb_mtp_write_data(MTPState *s, uint32_t handle) { MTPData *d = s->data_out; MTPObject *parent = @@ -1616,26 +1616,33 @@ static int usb_mtp_write_data(MTPState *s) if (!parent || !s->write_pending) { usb_mtp_queue_result(s, RES_INVALID_OBJECTINFO, d->trans, 0, 0, 0, 0); - return 1; + return; } if (s->dataset.filename) { path = g_strdup_printf("%s/%s", parent->path, s->dataset.filename); if (s->dataset.format == FMT_ASSOCIATION) { ret = mkdir(path, mask); - goto free; + if (!ret) { + usb_mtp_queue_result(s, RES_OK, d->trans, 3, + QEMU_STORAGE_ID, + s->dataset.parent_handle, + handle); + goto close; + } + goto done; } + d->fd = open(path, O_CREAT | O_WRONLY | O_CLOEXEC | O_NOFOLLOW, mask); if (d->fd == -1) { - usb_mtp_queue_result(s, RES_STORE_FULL, d->trans, - 0, 0, 0, 0); + ret = 1; goto done; } /* Return success if initiator sent 0 sized data */ if (!s->dataset.size) { - goto success; + goto done; } if (d->length != MTP_WRITE_BUF_SZ && !d->pending) { d->write_status = WRITE_END; @@ -1647,13 +1654,12 @@ static int usb_mtp_write_data(MTPState *s) rc = write_retry(d->fd, d->data, d->data_offset, d->offset - d->data_offset); if (rc != d->data_offset) { - usb_mtp_queue_result(s, RES_STORE_FULL, d->trans, - 0, 0, 0, 0); + ret = 1; goto done; } if (d->write_status != WRITE_END) { g_free(path); - return ret; + return; } else { /* * Return an incomplete transfer if file size doesn't match @@ -1665,16 +1671,20 @@ static int usb_mtp_write_data(MTPState *s) usb_mtp_update_object(parent, s->dataset.filename)) { usb_mtp_queue_result(s, RES_INCOMPLETE_TRANSFER, d->trans, 0, 0, 0, 0); - goto done; + goto close; } } } -success: - usb_mtp_queue_result(s, RES_OK, d->trans, - 0, 0, 0, 0); - done: + if (ret) { + usb_mtp_queue_result(s, RES_STORE_FULL, d->trans, + 0, 0, 0, 0); + } else { + usb_mtp_queue_result(s, RES_OK, d->trans, + 0, 0, 0, 0); + } +close: /* * The write dataset is kept around and freed only * on success or if another write request comes in @@ -1683,12 +1693,10 @@ done: close(d->fd); d->fd = -1; } -free: g_free(s->dataset.filename); s->dataset.size = 0; g_free(path); s->write_pending = false; - return ret; } static void usb_mtp_write_metadata(MTPState *s, uint64_t dlen) @@ -1725,16 +1733,11 @@ static void usb_mtp_write_metadata(MTPState *s, uint64_t dlen) s->write_pending = true; if (s->dataset.format == FMT_ASSOCIATION) { - if (usb_mtp_write_data(s)) { - /* next_handle will be allocated to the newly created dir */ - usb_mtp_queue_result(s, RES_STORE_FULL, d->trans, - 0, 0, 0, 0); - return; - } + usb_mtp_write_data(s, next_handle); + } else { + usb_mtp_queue_result(s, RES_OK, d->trans, 3, QEMU_STORAGE_ID, + s->dataset.parent_handle, next_handle); } - - usb_mtp_queue_result(s, RES_OK, d->trans, 3, QEMU_STORAGE_ID, - s->dataset.parent_handle, next_handle); } static void usb_mtp_get_data(MTPState *s, mtp_container *container, @@ -1814,14 +1817,14 @@ static void usb_mtp_get_data(MTPState *s, mtp_container *container, } else { d->write_status = WRITE_START; } - usb_mtp_write_data(s); + usb_mtp_write_data(s, 0); usb_mtp_data_free(s->data_out); s->data_out = NULL; return; } if (d->data_offset == d->length) { d->pending = true; - usb_mtp_write_data(s); + usb_mtp_write_data(s, 0); } break; default: