From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by mail.openembedded.org (Postfix) with ESMTP id 87992791E3 for ; Wed, 22 Aug 2018 15:04:56 +0000 (UTC) Received: from pps.filterd (m0098420.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w7MF1SLD135875 for ; Wed, 22 Aug 2018 11:04:57 -0400 Received: from e35.co.us.ibm.com (e35.co.us.ibm.com [32.97.110.153]) by mx0b-001b2d01.pphosted.com with ESMTP id 2m18djd7tf-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 22 Aug 2018 11:04:57 -0400 Received: from localhost by e35.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 22 Aug 2018 09:04:56 -0600 Received: from b03cxnp08025.gho.boulder.ibm.com (9.17.130.17) by e35.co.us.ibm.com (192.168.1.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Wed, 22 Aug 2018 09:04:54 -0600 Received: from b03ledav003.gho.boulder.ibm.com (b03ledav003.gho.boulder.ibm.com [9.17.130.234]) by b03cxnp08025.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w7MF4rWv19267732 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Wed, 22 Aug 2018 08:04:53 -0700 Received: from b03ledav003.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CFFCA6A047 for ; Wed, 22 Aug 2018 09:04:53 -0600 (MDT) Received: from b03ledav003.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 988E36A04D for ; Wed, 22 Aug 2018 09:04:53 -0600 (MDT) Received: from adriana-mbp.austin.ibm.com (unknown [9.53.179.204]) by b03ledav003.gho.boulder.ibm.com (Postfix) with ESMTPS for ; Wed, 22 Aug 2018 09:04:53 -0600 (MDT) From: Adriana Kobylak Mime-Version: 1.0 (Mac OS X Mail 11.5 \(3445.9.1\)) Date: Wed, 22 Aug 2018 10:00:03 -0500 References: <20180730173250.13844.96887@do.openembedded.org> <1532973389-30163-1-git-send-email-anoo@linux.ibm.com> To: openembedded-core@lists.openembedded.org In-Reply-To: <1532973389-30163-1-git-send-email-anoo@linux.ibm.com> X-Mailer: Apple Mail (2.3445.9.1) X-TM-AS-GCONF: 00 x-cbid: 18082215-0012-0000-0000-000016A33640 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00009592; HX=3.00000242; KW=3.00000007; PH=3.00000004; SC=3.00000266; SDB=6.01077247; UDB=6.00555392; IPR=6.00857222; MB=3.00022869; MTD=3.00000008; XFM=3.00000015; UTC=2018-08-22 15:04:55 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18082215-0013-0000-0000-00005421B270 Message-Id: X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2018-08-22_07:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=1 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 lowpriorityscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1808220153 Subject: [PATCH] mtd-utils: Revert "Return correct error number in ubi_get_vol_in" X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Aug 2018 15:04:56 -0000 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable > On Jul 30, 2018, at 12:56 PM, Adriana Kobylak = wrote: >=20 > Add mtd-utils upstream patch that fixes a regression on the > mtd-utils tools such as ubinfo. >=20 > Details of the issue which affects mtd-utils 2.0.1 and 2.0.2: > http://lists.infradead.org/pipermail/linux-mtd/2018-June/081562.html >=20 > Upstream-Status: Accepted = [http://git.infradead.org/mtd-utils.git/commit/0f833ac73ad631248826386e291= 8d8571ecf0347] >=20 > Signed-off-by: Adriana Kobylak > --- > ...rn-correct-error-number-in-ubi_get_vol_in.patch | 92 = ++++++++++++++++++++++ > meta/recipes-devtools/mtd/mtd-utils_git.bb | 1 + > 2 files changed, 93 insertions(+) > create mode 100644 = meta/recipes-devtools/mtd/mtd-utils/0001-Revert-Return-correct-error-numbe= r-in-ubi_get_vol_in.patch >=20 > diff --git = a/meta/recipes-devtools/mtd/mtd-utils/0001-Revert-Return-correct-error-num= ber-in-ubi_get_vol_in.patch = b/meta/recipes-devtools/mtd/mtd-utils/0001-Revert-Return-correct-error-num= ber-in-ubi_get_vol_in.patch > new file mode 100644 > index 0000000..4ece56b > --- /dev/null > +++ = b/meta/recipes-devtools/mtd/mtd-utils/0001-Revert-Return-correct-error-num= ber-in-ubi_get_vol_in.patch > @@ -0,0 +1,92 @@ > +=46rom 0f833ac73ad631248826386e2918d8571ecf0347 Mon Sep 17 00:00:00 = 2001 > +From: David Oberhollenzer > +Date: Sat, 9 Jun 2018 16:45:22 +0200 > +Subject: [PATCH] Revert "Return correct error number in = ubi_get_vol_info1" > + > +This reverts commit dede98ffb706676309488d7cc660f569548d5930. > + > +The original commit tried to fix a descrepancy between the = implementation > +and the documentation by making the implementation comply. > + > +When making the change, it was overlooked, that ubinfo and ubirename = were > +written against the implementation instead of the behaviour specified = by > +the documentation. So were further internal functions like > +ubi_get_vol_info1_nm which further breaks ubirmvol. > + > +A report with an outline of a resulting problem can be read on > +the mailing list: > + > +http://lists.infradead.org/pipermail/linux-mtd/2018-June/081562.html > + > +=46rom the report: > + > +steps to reproduce: have mtd-utils 2.0.1 or 2.0.2 > + > +0. make a bunch of ubi volumes in sequential order > + > +ubimkvol /dev/ubi0 -s 64KiB -N test1 > +ubimkvol /dev/ubi0 -s 64KiB -N test2 > +ubimkvol /dev/ubi0 -s 64KiB -N test3 > +ubimkvol /dev/ubi0 -s 64KiB -N test4 > +.. > + > +1. delete the test1 volume, making a hole in the volume table > + > +ubirmvol /dev/ubi0 -N test1 > + > +2. try an affected tool (i.e. "ubirmvol /dev/ubi0 -N test4" ) > + > + |root at mr24:/# ubirmvol /dev/ubi0 -N test4 > + |ubirmvol: error!: cannot find UBI volume "test4" > + | error 19 (No such device) > + > +or "ubinfo -a" > + > + | root at mr24:/# ubinfo -a > + | UBI version: 1 > + | Count of UBI devices: 1 > + | UBI control device major/minor: 10:59 > + | Present UBI devices: ubi0 > + | > + | ubi0 > + | Volumes count: 11 > + | Logical eraseblock size: 15872 bytes, 15.5 KiB > + | Total amount of logical eraseblocks: 1952 (30982144 bytes, = 29.5 MiB) > + | Amount of available logical eraseblocks: 75 (1190400 bytes, 1.1 = MiB) > + | Maximum count of volumes 92 > + | Count of bad physical eraseblocks: 0 > + | Count of reserved physical eraseblocks: 40 > + | Current maximum erase counter value: 984 > + | Minimum input/output unit size: 512 bytes > + | Character device major/minor: 251:0 > + | ubinfo: error!: libubi failed to probe volume 5 on ubi0 > + | error 19 (No such device) > + | Present volumes: 0, 1, 2, 3, 4root at = mr24:/# > + > +Reported-by: Christian Lamparter > +Signed-off-by: David Oberhollenzer = > +Upstream-Status: Accepted = [http://git.infradead.org/mtd-utils.git/commit/0f833ac73ad631248826386e291= 8d8571ecf0347] > +--- > + lib/libubi.c | 5 +---- > + 1 file changed, 1 insertion(+), 4 deletions(-) > + > +diff --git a/lib/libubi.c b/lib/libubi.c > +index b50e68a..978b433 100644 > +--- a/lib/libubi.c > ++++ b/lib/libubi.c > +@@ -1240,11 +1240,8 @@ int ubi_get_vol_info1(libubi_t desc, int = dev_num, int vol_id, > + info->dev_num =3D dev_num; > + info->vol_id =3D vol_id; > +=20 > +- if (vol_get_major(lib, dev_num, vol_id, &info->major, = &info->minor)) { > +- if (errno =3D=3D ENOENT) > +- errno =3D ENODEV; > ++ if (vol_get_major(lib, dev_num, vol_id, &info->major, = &info->minor)) > + return -1; > +- } > +=20 > + ret =3D vol_read_data(lib->vol_type, dev_num, vol_id, buf, 50); > + if (ret < 0) > +--=20 > +2.14.4 > + > diff --git a/meta/recipes-devtools/mtd/mtd-utils_git.bb = b/meta/recipes-devtools/mtd/mtd-utils_git.bb > index 97a3e0c..f53c6c1 100644 > --- a/meta/recipes-devtools/mtd/mtd-utils_git.bb > +++ b/meta/recipes-devtools/mtd/mtd-utils_git.bb > @@ -15,6 +15,7 @@ PV =3D "2.0.2+${SRCPV}" > SRCREV =3D "bc63d36e39f389c8c17f6a8e9db47f2acc884659" > SRC_URI =3D "git://git.infradead.org/mtd-utils.git \ > file://add-exclusion-to-mkfs-jffs2-git-2.patch \ > + = file://0001-Revert-Return-correct-error-number-in-ubi_get_vol_in.patch \ > " >=20 > S =3D "${WORKDIR}/git/" > --=20 > 1.8.3.1 >=20