From: Jingbo Xu <jefflexu@linux.alibaba.com>
To: xiang@kernel.org, linux-erofs@lists.ozlabs.org
Subject: [PATCH 05/13] erofs-utils: lib: keep self maintained devname
Date: Mon, 14 Aug 2023 11:42:31 +0800 [thread overview]
Message-ID: <20230814034239.54660-6-jefflexu@linux.alibaba.com> (raw)
In-Reply-To: <20230814034239.54660-1-jefflexu@linux.alibaba.com>
Keep self allocated and maintained devname in erofs_sb_info.
Signed-off-by: Jingbo Xu <jefflexu@linux.alibaba.com>
---
include/erofs/internal.h | 2 +-
lib/io.c | 14 ++++++++++++--
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/include/erofs/internal.h b/include/erofs/internal.h
index a04e6a6..892dc96 100644
--- a/include/erofs/internal.h
+++ b/include/erofs/internal.h
@@ -61,7 +61,7 @@ struct erofs_device_info {
struct erofs_sb_info {
struct erofs_device_info *devs;
- const char *devname;
+ char *devname;
u64 total_blocks;
u64 primarydevice_blocks;
diff --git a/lib/io.c b/lib/io.c
index 8d84de2..1545436 100644
--- a/lib/io.c
+++ b/lib/io.c
@@ -10,6 +10,7 @@
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif
+#include <stdlib.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
#include "erofs/io.h"
@@ -46,6 +47,7 @@ static int dev_get_blkdev_size(int fd, u64 *bytes)
void dev_close(struct erofs_sb_info *sbi)
{
close(sbi->devfd);
+ free(sbi->devname);
sbi->devname = NULL;
sbi->devfd = -1;
sbi->devsz = 0;
@@ -95,7 +97,11 @@ int dev_open(struct erofs_sb_info *sbi, const char *dev)
return -EINVAL;
}
- sbi->devname = dev;
+ sbi->devname = strdup(dev);
+ if (!sbi->devname) {
+ close(fd);
+ return -ENOMEM;
+ }
sbi->devfd = fd;
erofs_info("successfully to open %s", dev);
@@ -136,8 +142,12 @@ int dev_open_ro(struct erofs_sb_info *sbi, const char *dev)
return -errno;
}
+ sbi->devname = strdup(dev);
+ if (!sbi->devname) {
+ close(fd);
+ return -ENOMEM;
+ }
sbi->devfd = fd;
- sbi->devname = dev;
sbi->devsz = INT64_MAX;
return 0;
}
--
2.19.1.6.gb485710b
next prev parent reply other threads:[~2023-08-14 3:43 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-14 3:42 [PATCH 00/13] erofs-utils: mkfs: introduce rebuild mode Jingbo Xu
2023-08-14 3:42 ` [PATCH 01/13] erofs-utils: fix overriding of i_rdev for special device Jingbo Xu
2023-08-14 5:42 ` Gao Xiang
2023-08-14 3:42 ` [PATCH 02/13] erofs-utils: lib: add list_splice_tail() helper Jingbo Xu
2023-08-14 5:50 ` Gao Xiang
2023-08-14 3:42 ` [PATCH 03/13] erofs-utils: lib: read i_ino in erofs_read_inode_from_disk() Jingbo Xu
2023-08-14 6:03 ` Gao Xiang
2023-08-14 3:42 ` [PATCH 04/13] erofs-utils: lib: fix erofs_init_devices() in multidev mode Jingbo Xu
2023-08-14 6:39 ` Gao Xiang
2023-08-14 3:42 ` Jingbo Xu [this message]
2023-08-14 6:43 ` [PATCH 05/13] erofs-utils: lib: keep self maintained devname Gao Xiang
2023-08-14 6:55 ` Gao Xiang
2023-08-14 3:42 ` [PATCH 06/13] erofs-utils: lib: make erofs_get_unhashed_chunk() global Jingbo Xu
2023-08-14 3:42 ` [PATCH 07/13] erofs-utils: lib: add erofs_read_xattrs_from_disk() helper Jingbo Xu
2023-08-14 6:46 ` Gao Xiang
2023-08-14 6:59 ` Jingbo Xu
2023-08-14 3:42 ` [PATCH 08/13] erofs-utils: lib: add erofs_inode_tag_opaque() helper Jingbo Xu
2023-08-14 7:05 ` Gao Xiang
2023-08-14 3:42 ` [PATCH 09/13] erofs-utils: lib: add erofs_insert_ihash() helper Jingbo Xu
2023-08-14 3:42 ` [PATCH 10/13] erofs-utils: lib: add erofs_rebuild_dump_tree() helper Jingbo Xu
2023-08-14 3:42 ` [PATCH 11/13] erofs-utils: lib: add erofs_rebuild_get_dentry() helper Jingbo Xu
2023-08-14 3:42 ` [PATCH 12/13] erofs-utils: lib: add erofs_rebuild_load_tree() helper Jingbo Xu
2023-08-14 3:42 ` [PATCH 13/13] erofs-utils: mkfs: introduce rebuild mode Jingbo Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230814034239.54660-6-jefflexu@linux.alibaba.com \
--to=jefflexu@linux.alibaba.com \
--cc=linux-erofs@lists.ozlabs.org \
--cc=xiang@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox