Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/811970/?format=api
{ "id": 811970, "url": "http://patchwork.ozlabs.org/api/patches/811970/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/patch/20170909171606.20029-5-robdclark@gmail.com/", "project": { "id": 18, "url": "http://patchwork.ozlabs.org/api/projects/18/?format=api", "name": "U-Boot", "link_name": "uboot", "list_id": "u-boot.lists.denx.de", "list_email": "u-boot@lists.denx.de", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20170909171606.20029-5-robdclark@gmail.com>", "list_archive_url": null, "date": "2017-09-09T17:15:55", "name": "[U-Boot,v3,4/9] fs: add fs_readdir()", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "d3a7b74b85378a267463de92a319dc5151906399", "submitter": { "id": 18760, "url": "http://patchwork.ozlabs.org/api/people/18760/?format=api", "name": "Rob Clark", "email": "robdclark@gmail.com" }, "delegate": { "id": 3651, "url": "http://patchwork.ozlabs.org/api/users/3651/?format=api", "username": "trini", "first_name": "Tom", "last_name": "Rini", "email": "trini@ti.com" }, "mbox": "http://patchwork.ozlabs.org/project/uboot/patch/20170909171606.20029-5-robdclark@gmail.com/mbox/", "series": [ { "id": 2355, "url": "http://patchwork.ozlabs.org/api/series/2355/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/list/?series=2355", "date": "2017-09-09T17:15:51", "name": "fs/fat: cleanups + readdir implementation", "version": 3, "mbox": "http://patchwork.ozlabs.org/series/2355/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/811970/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/811970/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<u-boot-bounces@lists.denx.de>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@bilbo.ozlabs.org", "Authentication-Results": [ "ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.denx.de\n\t(client-ip=81.169.180.215; helo=lists.denx.de;\n\tenvelope-from=u-boot-bounces@lists.denx.de;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"YW25BJ/Y\"; dkim-atps=neutral" ], "Received": [ "from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xqLWT60hBz9t16\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSun, 10 Sep 2017 03:18:45 +1000 (AEST)", "by lists.denx.de (Postfix, from userid 105)\n\tid A335DC21F04; Sat, 9 Sep 2017 17:16:58 +0000 (UTC)", "from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id C0F24C21E54;\n\tSat, 9 Sep 2017 17:16:55 +0000 (UTC)", "by lists.denx.de (Postfix, from userid 105)\n\tid 93C35C21C35; Sat, 9 Sep 2017 17:16:43 +0000 (UTC)", "from mail-qk0-f193.google.com (mail-qk0-f193.google.com\n\t[209.85.220.193])\n\tby lists.denx.de (Postfix) with ESMTPS id E563EC21EFC\n\tfor <u-boot@lists.denx.de>; Sat, 9 Sep 2017 17:16:38 +0000 (UTC)", "by mail-qk0-f193.google.com with SMTP id o77so3234277qke.2\n\tfor <u-boot@lists.denx.de>; Sat, 09 Sep 2017 10:16:38 -0700 (PDT)", "from localhost ([2601:184:4780:aac0:25f8:dd96:a084:785a])\n\tby smtp.gmail.com with ESMTPSA id\n\tg15sm3202553qtk.47.2017.09.09.10.16.36\n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tSat, 09 Sep 2017 10:16:36 -0700 (PDT)" ], "X-Spam-Checker-Version": "SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de", "X-Spam-Level": "", "X-Spam-Status": "No, score=-0.0 required=5.0 tests=FREEMAIL_FROM,\n\tRCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,\n\tT_DKIM_INVALID\n\tautolearn=unavailable autolearn_force=no version=3.4.0", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=H/PHz9M1Onapa4r2mUlmZrc6JQMTaIbCS4SXtWVnBXA=;\n\tb=YW25BJ/Yc6PCj0pKkRzmWNeflRLmWRIJ0K+DRZM02rMGjmzeF+l4PGLbMPsTBG7cWS\n\tesjm0IdVKSRAsSv5+1Vd/eblmfplRbdPCCCxws77ymVgPv9dT+zWo+vVhiLZyUx2GxGx\n\tsQD897Ct2pmdfr1P3zDTVzLAFgd7lpWfKowHXNw3qlv2rxU+SI5w5Y1+PBa7AmVPL9ii\n\tJWlmIaKTalLJmYG7d43RWOzdcvmrA2JpS2dfjsHbT0Z1by9opmyQBc7yc/f2qSaJbXs9\n\tUyC7euvzQbvN7uo3m7Kk7tH1RlsxW8DJakxWVnZsWIbjidI6LhqovAoGfa9pLS2VUChS\n\thWvQ==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=H/PHz9M1Onapa4r2mUlmZrc6JQMTaIbCS4SXtWVnBXA=;\n\tb=sYDmPbiCzGrcBwML7HKvPvfeyvmJnjp+CkTEedA7AFYMjCsUlTdfn5+evxBJ9AYq8w\n\tfA6ORUA1FMF/+dlkntBrn5qhNWSgKhJaHwcRD8r8CiwO/Hx4FLtVaYOr88eHyXtF8dJv\n\teOaoLGIbSt3qqCrrCO3fa+eGYKmKsa++Z+9rarhImFCiyQyga4wEmVOJsCoqDH21Aj6X\n\t7qWB5rtvI5fQGM5BEi2b4nMVtTvVKGR9bw7TqZ6FYRbEES1WaekiCg3UfFU0Ngj08VlE\n\tjZGFjY6YLFGtl9dgPHwJFOBc/+Rz1Za8Dwo3iqlJbhWmjDEbkfYd/QuCH/uj3NYRQfH4\n\t208w==", "X-Gm-Message-State": "AHPjjUi0N4HPnYzmy8OheJoHlZkyMyCjzmcXTfsD0Yqsku+bR+3haDWa\n\tG1bIa9VRP06FFGG0u3w=", "X-Google-Smtp-Source": "AOwi7QAFLS4uj4W5P7yBmI06muJ5+2dAloFk0nk/dPTMmEuTBD9zhzyZIs76XevfQrqY6lkGKJSIAw==", "X-Received": "by 10.55.52.19 with SMTP id b19mr8598444qka.77.1504977397444;\n\tSat, 09 Sep 2017 10:16:37 -0700 (PDT)", "From": "Rob Clark <robdclark@gmail.com>", "To": "U-Boot Mailing List <u-boot@lists.denx.de>", "Date": "Sat, 9 Sep 2017 13:15:55 -0400", "Message-Id": "<20170909171606.20029-5-robdclark@gmail.com>", "X-Mailer": "git-send-email 2.13.5", "In-Reply-To": "<20170909171606.20029-1-robdclark@gmail.com>", "References": "<20170909171606.20029-1-robdclark@gmail.com>", "MIME-Version": "1.0", "Cc": "Petr Kulhavy <brain@jikos.cz>, Heinrich Schuchardt <xypron.glpk@gmx.de>, \n\tZhikang Zhang <zhikang.zhang@nxp.com>,\n\tAlison Chaiken <alison@peloton-tech.com>,\n\tSteve Rae <steve.rae@raedomain.com>, \n\tMaxime Ripard <maxime.ripard@free-electrons.com>", "Subject": "[U-Boot] [PATCH v3 4/9] fs: add fs_readdir()", "X-BeenThere": "u-boot@lists.denx.de", "X-Mailman-Version": "2.1.18", "Precedence": "list", "List-Id": "U-Boot discussion <u-boot.lists.denx.de>", "List-Unsubscribe": "<https://lists.denx.de/options/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=unsubscribe>", "List-Archive": "<http://lists.denx.de/pipermail/u-boot/>", "List-Post": "<mailto:u-boot@lists.denx.de>", "List-Help": "<mailto:u-boot-request@lists.denx.de?subject=help>", "List-Subscribe": "<https://lists.denx.de/listinfo/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=subscribe>", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "base64", "Errors-To": "u-boot-bounces@lists.denx.de", "Sender": "\"U-Boot\" <u-boot-bounces@lists.denx.de>" }, "content": "Needed to support efi file protocol. The fallback.efi loader wants\nto be able to read the contents of the /EFI directory to find an OS\nto boot.\n\nModelled after POSIX opendir()/readdir()/closedir(). Unlike the other\nfs APIs, this is stateful (ie. state is held in the FS_DIR \"directory\nstream\"), to avoid re-traversing of the directory structure at each\nstep. The directory stream must be released with closedir() when it\nis no longer needed.\n\nSigned-off-by: Rob Clark <robdclark@gmail.com>\nReviewed-by: Łukasz Majewski <lukma@denx.de>\n---\n disk/part.c | 31 ++++++++++-------\n fs/fs.c | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n include/fs.h | 67 +++++++++++++++++++++++++++++++++++++\n include/part.h | 9 +++++\n 4 files changed, 199 insertions(+), 12 deletions(-)", "diff": "diff --git a/disk/part.c b/disk/part.c\nindex c67fdacc79..aa9183d696 100644\n--- a/disk/part.c\n+++ b/disk/part.c\n@@ -331,6 +331,24 @@ int part_get_info(struct blk_desc *dev_desc, int part,\n \treturn -1;\n }\n \n+int part_get_info_whole_disk(struct blk_desc *dev_desc, disk_partition_t *info)\n+{\n+\tinfo->start = 0;\n+\tinfo->size = dev_desc->lba;\n+\tinfo->blksz = dev_desc->blksz;\n+\tinfo->bootable = 0;\n+\tstrcpy((char *)info->type, BOOT_PART_TYPE);\n+\tstrcpy((char *)info->name, \"Whole Disk\");\n+#if CONFIG_IS_ENABLED(PARTITION_UUIDS)\n+\tinfo->uuid[0] = 0;\n+#endif\n+#ifdef CONFIG_PARTITION_TYPE_GUID\n+\tinfo->type_guid[0] = 0;\n+#endif\n+\n+\treturn 0;\n+}\n+\n int blk_get_device_by_str(const char *ifname, const char *dev_hwpart_str,\n \t\t\t struct blk_desc **dev_desc)\n {\n@@ -523,18 +541,7 @@ int blk_get_device_part_str(const char *ifname, const char *dev_part_str,\n \n \t\t(*dev_desc)->log2blksz = LOG2((*dev_desc)->blksz);\n \n-\t\tinfo->start = 0;\n-\t\tinfo->size = (*dev_desc)->lba;\n-\t\tinfo->blksz = (*dev_desc)->blksz;\n-\t\tinfo->bootable = 0;\n-\t\tstrcpy((char *)info->type, BOOT_PART_TYPE);\n-\t\tstrcpy((char *)info->name, \"Whole Disk\");\n-#if CONFIG_IS_ENABLED(PARTITION_UUIDS)\n-\t\tinfo->uuid[0] = 0;\n-#endif\n-#ifdef CONFIG_PARTITION_TYPE_GUID\n-\t\tinfo->type_guid[0] = 0;\n-#endif\n+\t\tpart_get_info_whole_disk(*dev_desc, info);\n \n \t\tret = 0;\n \t\tgoto cleanup;\ndiff --git a/fs/fs.c b/fs/fs.c\nindex 13cd3626c6..fc0c953fcb 100644\n--- a/fs/fs.c\n+++ b/fs/fs.c\n@@ -21,6 +21,7 @@\n DECLARE_GLOBAL_DATA_PTR;\n \n static struct blk_desc *fs_dev_desc;\n+static int fs_dev_part;\n static disk_partition_t fs_partition;\n static int fs_type = FS_TYPE_ANY;\n \n@@ -69,6 +70,12 @@ static inline int fs_uuid_unsupported(char *uuid_str)\n \treturn -1;\n }\n \n+static inline int fs_opendir_unsupported(const char *filename,\n+\t\t\t\t\t struct fs_dir_stream **dirs)\n+{\n+\treturn -EACCES;\n+}\n+\n struct fstype_info {\n \tint fstype;\n \tchar *name;\n@@ -92,6 +99,20 @@ struct fstype_info {\n \t\t loff_t len, loff_t *actwrite);\n \tvoid (*close)(void);\n \tint (*uuid)(char *uuid_str);\n+\t/*\n+\t * Open a directory stream. On success return 0 and directory\n+\t * stream pointer via 'dirsp'. On error, return -errno. See\n+\t * fs_opendir().\n+\t */\n+\tint (*opendir)(const char *filename, struct fs_dir_stream **dirsp);\n+\t/*\n+\t * Read next entry from directory stream. On success return 0\n+\t * and directory entry pointer via 'dentp'. On error return\n+\t * -errno. See fs_readdir().\n+\t */\n+\tint (*readdir)(struct fs_dir_stream *dirs, struct fs_dirent **dentp);\n+\t/* see fs_closedir() */\n+\tvoid (*closedir)(struct fs_dir_stream *dirs);\n };\n \n static struct fstype_info fstypes[] = {\n@@ -112,6 +133,7 @@ static struct fstype_info fstypes[] = {\n \t\t.write = fs_write_unsupported,\n #endif\n \t\t.uuid = fs_uuid_unsupported,\n+\t\t.opendir = fs_opendir_unsupported,\n \t},\n #endif\n #ifdef CONFIG_FS_EXT4\n@@ -131,6 +153,7 @@ static struct fstype_info fstypes[] = {\n \t\t.write = fs_write_unsupported,\n #endif\n \t\t.uuid = ext4fs_uuid,\n+\t\t.opendir = fs_opendir_unsupported,\n \t},\n #endif\n #ifdef CONFIG_SANDBOX\n@@ -146,6 +169,7 @@ static struct fstype_info fstypes[] = {\n \t\t.read = fs_read_sandbox,\n \t\t.write = fs_write_sandbox,\n \t\t.uuid = fs_uuid_unsupported,\n+\t\t.opendir = fs_opendir_unsupported,\n \t},\n #endif\n #ifdef CONFIG_CMD_UBIFS\n@@ -161,6 +185,7 @@ static struct fstype_info fstypes[] = {\n \t\t.read = ubifs_read,\n \t\t.write = fs_write_unsupported,\n \t\t.uuid = fs_uuid_unsupported,\n+\t\t.opendir = fs_opendir_unsupported,\n \t},\n #endif\n \t{\n@@ -175,6 +200,7 @@ static struct fstype_info fstypes[] = {\n \t\t.read = fs_read_unsupported,\n \t\t.write = fs_write_unsupported,\n \t\t.uuid = fs_uuid_unsupported,\n+\t\t.opendir = fs_opendir_unsupported,\n \t},\n };\n \n@@ -228,6 +254,31 @@ int fs_set_blk_dev(const char *ifname, const char *dev_part_str, int fstype)\n \n \t\tif (!info->probe(fs_dev_desc, &fs_partition)) {\n \t\t\tfs_type = info->fstype;\n+\t\t\tfs_dev_part = part;\n+\t\t\treturn 0;\n+\t\t}\n+\t}\n+\n+\treturn -1;\n+}\n+\n+/* set current blk device w/ blk_desc + partition # */\n+int fs_set_blk_dev_with_part(struct blk_desc *desc, int part)\n+{\n+\tstruct fstype_info *info;\n+\tint ret, i;\n+\n+\tif (part >= 1)\n+\t\tret = part_get_info(desc, part, &fs_partition);\n+\telse\n+\t\tret = part_get_info_whole_disk(desc, &fs_partition);\n+\tif (ret)\n+\t\treturn ret;\n+\tfs_dev_desc = desc;\n+\n+\tfor (i = 0, info = fstypes; i < ARRAY_SIZE(fstypes); i++, info++) {\n+\t\tif (!info->probe(fs_dev_desc, &fs_partition)) {\n+\t\t\tfs_type = info->fstype;\n \t\t\treturn 0;\n \t\t}\n \t}\n@@ -334,6 +385,59 @@ int fs_write(const char *filename, ulong addr, loff_t offset, loff_t len,\n \treturn ret;\n }\n \n+struct fs_dir_stream *fs_opendir(const char *filename)\n+{\n+\tstruct fstype_info *info = fs_get_info(fs_type);\n+\tstruct fs_dir_stream *dirs = NULL;\n+\tint ret;\n+\n+\tret = info->opendir(filename, &dirs);\n+\tfs_close();\n+\tif (ret) {\n+\t\terrno = -ret;\n+\t\treturn NULL;\n+\t}\n+\n+\tdirs->desc = fs_dev_desc;\n+\tdirs->part = fs_dev_part;\n+\n+\treturn dirs;\n+}\n+\n+struct fs_dirent *fs_readdir(struct fs_dir_stream *dirs)\n+{\n+\tstruct fstype_info *info;\n+\tstruct fs_dirent *dirent;\n+\tint ret;\n+\n+\tfs_set_blk_dev_with_part(dirs->desc, dirs->part);\n+\tinfo = fs_get_info(fs_type);\n+\n+\tret = info->readdir(dirs, &dirent);\n+\tfs_close();\n+\tif (ret) {\n+\t\terrno = -ret;\n+\t\treturn NULL;\n+\t}\n+\n+\treturn dirent;\n+}\n+\n+void fs_closedir(struct fs_dir_stream *dirs)\n+{\n+\tstruct fstype_info *info;\n+\n+\tif (!dirs)\n+\t\treturn;\n+\n+\tfs_set_blk_dev_with_part(dirs->desc, dirs->part);\n+\tinfo = fs_get_info(fs_type);\n+\n+\tinfo->closedir(dirs);\n+\tfs_close();\n+}\n+\n+\n int do_size(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],\n \t\tint fstype)\n {\ndiff --git a/include/fs.h b/include/fs.h\nindex 2f2aca8378..0869ad6e80 100644\n--- a/include/fs.h\n+++ b/include/fs.h\n@@ -27,6 +27,17 @@\n int fs_set_blk_dev(const char *ifname, const char *dev_part_str, int fstype);\n \n /*\n+ * fs_set_blk_dev_with_part - Set current block device + partition\n+ *\n+ * Similar to fs_set_blk_dev(), but useful for cases where you already\n+ * know the blk_desc and part number.\n+ *\n+ * Returns 0 on success.\n+ * Returns non-zero if invalid partition or error accessing the disk.\n+ */\n+int fs_set_blk_dev_with_part(struct blk_desc *desc, int part);\n+\n+/*\n * Print the list of files on the partition previously set by fs_set_blk_dev(),\n * in directory \"dirname\".\n *\n@@ -79,6 +90,62 @@ int fs_write(const char *filename, ulong addr, loff_t offset, loff_t len,\n \t loff_t *actwrite);\n \n /*\n+ * Directory entry types, matches the subset of DT_x in posix readdir()\n+ * which apply to u-boot.\n+ */\n+#define FS_DT_DIR 4 /* directory */\n+#define FS_DT_REG 8 /* regular file */\n+#define FS_DT_LNK 10 /* symbolic link */\n+\n+/*\n+ * A directory entry, returned by fs_readdir(). Returns information\n+ * about the file/directory at the current directory entry position.\n+ */\n+struct fs_dirent {\n+\tunsigned type; /* one of FS_DT_x (not a mask) */\n+\tloff_t size; /* size in bytes */\n+\tchar name[256];\n+};\n+\n+/* Note: fs_dir_stream should be treated as opaque to the user of fs layer */\n+struct fs_dir_stream {\n+\t/* private to fs. layer: */\n+\tstruct blk_desc *desc;\n+\tint part;\n+};\n+\n+/*\n+ * fs_opendir - Open a directory\n+ *\n+ * @filename: the path to directory to open\n+ * @return a pointer to the directory stream or NULL on error and errno\n+ * set appropriately\n+ */\n+struct fs_dir_stream *fs_opendir(const char *filename);\n+\n+/*\n+ * fs_readdir - Read the next directory entry in the directory stream.\n+ *\n+ * Works in an analogous way to posix readdir(). The previously returned\n+ * directory entry is no longer valid after calling fs_readdir() again.\n+ * After fs_closedir() is called, the returned directory entry is no\n+ * longer valid.\n+ *\n+ * @dirs: the directory stream\n+ * @return the next directory entry (only valid until next fs_readdir() or\n+ * fs_closedir() call, do not attempt to free()) or NULL if the end of\n+ * the directory is reached.\n+ */\n+struct fs_dirent *fs_readdir(struct fs_dir_stream *dirs);\n+\n+/*\n+ * fs_closedir - close a directory stream\n+ *\n+ * @dirs: the directory stream\n+ */\n+void fs_closedir(struct fs_dir_stream *dirs);\n+\n+/*\n * Common implementation for various filesystem commands, optionally limited\n * to a specific filesystem type via the fstype parameter.\n */\ndiff --git a/include/part.h b/include/part.h\nindex 0d5c99836b..86117a7ce5 100644\n--- a/include/part.h\n+++ b/include/part.h\n@@ -98,6 +98,12 @@ int host_get_dev_err(int dev, struct blk_desc **blk_devp);\n \n /* disk/part.c */\n int part_get_info(struct blk_desc *dev_desc, int part, disk_partition_t *info);\n+/**\n+ * part_get_info_whole_disk() - get partition info for the special case of\n+ * a partition occupying the entire disk.\n+ */\n+int part_get_info_whole_disk(struct blk_desc *dev_desc, disk_partition_t *info);\n+\n void part_print(struct blk_desc *dev_desc);\n void part_init(struct blk_desc *dev_desc);\n void dev_print(struct blk_desc *dev_desc);\n@@ -203,6 +209,9 @@ static inline struct blk_desc *mg_disk_get_dev(int dev) { return NULL; }\n \n static inline int part_get_info(struct blk_desc *dev_desc, int part,\n \t\t\t\tdisk_partition_t *info) { return -1; }\n+static inline int part_get_info_whole_disk(struct blk_desc *dev_desc,\n+\t\t\t\t\t disk_partition_t *info)\n+{ return -1; }\n static inline void part_print(struct blk_desc *dev_desc) {}\n static inline void part_init(struct blk_desc *dev_desc) {}\n static inline void dev_print(struct blk_desc *dev_desc) {}\n", "prefixes": [ "U-Boot", "v3", "4/9" ] }