From nobody Fri May 17 20:59:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553034440020175.2631630905248; Tue, 19 Mar 2019 15:27:20 -0700 (PDT) Received: from localhost ([127.0.0.1]:38429 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6NCR-0007up-Cs for importer@patchew.org; Tue, 19 Mar 2019 18:27:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46818) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6NBY-0007c0-1Y for qemu-devel@nongnu.org; Tue, 19 Mar 2019 18:26:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h6NBS-0007of-1p for qemu-devel@nongnu.org; Tue, 19 Mar 2019 18:26:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34626) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h6NBH-0007V8-Bi for qemu-devel@nongnu.org; Tue, 19 Mar 2019 18:26:09 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 44CB4307CDF2; Tue, 19 Mar 2019 21:46:55 +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 CA7796012C; Tue, 19 Mar 2019 21:46:54 +0000 (UTC) From: Bandan Das To: qemu-devel@nongnu.org Date: Tue, 19 Mar 2019 17:46:44 -0400 Message-Id: <20190319214645.20787-2-bsd@redhat.com> In-Reply-To: <20190319214645.20787-1-bsd@redhat.com> References: <20190319214645.20787-1-bsd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Tue, 19 Mar 2019 21:46:55 +0000 (UTC) Content-Transfer-Encoding: quoted-printable 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] 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" This function is used in the delete path only and can be replaced by a call to usb_mtp_object_free. Signed-off-by: Bandan Das Reviewed-by: Peter Maydell --- 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 =3D (DELETE_FAILURE | DELETE_SUCCESS), }; =20 -/* Assumes that children, if any, have been already freed */ -static void usb_mtp_object_free_one(MTPState *s, MTPObject *o) -{ - assert(o->nchildren =3D=3D 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 |=3D DELETE_FAILURE; } else { - usb_mtp_object_free_one(s, o); + usb_mtp_object_free(s, o); ret |=3D DELETE_SUCCESS; } } else if (o->format =3D=3D FMT_ASSOCIATION) { if (rmdir(o->path)) { ret |=3D DELETE_FAILURE; } else { - usb_mtp_object_free_one(s, o); + usb_mtp_object_free(s, o); ret |=3D DELETE_SUCCESS; } } --=20 2.19.2 From nobody Fri May 17 20:59:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15530373649982.055152879789034; Tue, 19 Mar 2019 16:16:04 -0700 (PDT) Received: from localhost ([127.0.0.1]:38909 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6Nxb-0006Dd-SD for importer@patchew.org; Tue, 19 Mar 2019 19:15:55 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49742) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6NvT-0004jK-Qt for qemu-devel@nongnu.org; Tue, 19 Mar 2019 19:13:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h6Nos-0006c9-Vi for qemu-devel@nongnu.org; Tue, 19 Mar 2019 19:06:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48526) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h6Nom-0006U5-QN for qemu-devel@nongnu.org; Tue, 19 Mar 2019 19:06:50 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D46B2308339D; Tue, 19 Mar 2019 21:46:55 +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 659896012C; Tue, 19 Mar 2019 21:46:55 +0000 (UTC) From: Bandan Das To: qemu-devel@nongnu.org Date: Tue, 19 Mar 2019 17:46:45 -0400 Message-Id: <20190319214645.20787-3-bsd@redhat.com> In-Reply-To: <20190319214645.20787-1-bsd@redhat.com> References: <20190319214645.20787-1-bsd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Tue, 19 Mar 2019 21:46:55 +0000 (UTC) Content-Transfer-Encoding: quoted-printable 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] 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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 | 58 +++++++++++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index 4dc1317e2e..ced3a22384 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, c= har *name) return ret; } =20 -static int usb_mtp_write_data(MTPState *s) +static void usb_mtp_write_data(MTPState *s, uint32_t handle) { MTPData *d =3D s->data_out; MTPObject *parent =3D @@ -1607,7 +1607,7 @@ static int usb_mtp_write_data(MTPState *s) char *path =3D NULL; uint64_t rc; mode_t mask =3D 0644; - int ret =3D 0; + int ret =3D 0, arg4 =3D 0, arg5 =3D 0, arg6 =3D 0, arg7 =3D 0; =20 assert(d !=3D NULL); =20 @@ -1616,26 +1616,32 @@ 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; } =20 if (s->dataset.filename) { path =3D g_strdup_printf("%s/%s", parent->path, s->dataset.fil= ename); if (s->dataset.format =3D=3D FMT_ASSOCIATION) { ret =3D mkdir(path, mask); - goto free; + if (!ret) { + arg4 =3D 3; + arg5 =3D QEMU_STORAGE_ID; + arg6 =3D s->dataset.parent_handle; + arg7 =3D handle; + } + goto done; } + d->fd =3D open(path, O_CREAT | O_WRONLY | O_CLOEXEC | O_NOFOLLOW, mask); if (d->fd =3D=3D -1) { - usb_mtp_queue_result(s, RES_STORE_FULL, d->trans, - 0, 0, 0, 0); + ret =3D 1; goto done; } =20 /* Return success if initiator sent 0 sized data */ if (!s->dataset.size) { - goto success; + goto done; } if (d->length !=3D MTP_WRITE_BUF_SZ && !d->pending) { d->write_status =3D WRITE_END; @@ -1647,13 +1653,12 @@ static int usb_mtp_write_data(MTPState *s) rc =3D write_retry(d->fd, d->data, d->data_offset, d->offset - d->data_offset); if (rc !=3D d->data_offset) { - usb_mtp_queue_result(s, RES_STORE_FULL, d->trans, - 0, 0, 0, 0); + ret =3D 1; goto done; } if (d->write_status !=3D WRITE_END) { g_free(path); - return ret; + return; } else { /* * Return an incomplete transfer if file size doesn't match @@ -1665,16 +1670,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; } } } =20 -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, + arg4, arg5, arg6, arg7); + } +close: /* * The write dataset is kept around and freed only * on success or if another write request comes in @@ -1683,12 +1692,10 @@ done: close(d->fd); d->fd =3D -1; } -free: g_free(s->dataset.filename); s->dataset.size =3D 0; g_free(path); s->write_pending =3D false; - return ret; } =20 static void usb_mtp_write_metadata(MTPState *s, uint64_t dlen) @@ -1725,16 +1732,11 @@ static void usb_mtp_write_metadata(MTPState *s, uin= t64_t dlen) s->write_pending =3D true; =20 if (s->dataset.format =3D=3D 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); } =20 static void usb_mtp_get_data(MTPState *s, mtp_container *container, @@ -1814,14 +1816,14 @@ static void usb_mtp_get_data(MTPState *s, mtp_conta= iner *container, } else { d->write_status =3D WRITE_START; } - usb_mtp_write_data(s); + usb_mtp_write_data(s, 0); usb_mtp_data_free(s->data_out); s->data_out =3D NULL; return; } if (d->data_offset =3D=3D d->length) { d->pending =3D true; - usb_mtp_write_data(s); + usb_mtp_write_data(s, 0); } break; default: --=20 2.19.2