From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CAF73C001B0 for ; Mon, 14 Aug 2023 03:43:11 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4RPKxB3tTbz3c8V for ; Mon, 14 Aug 2023 13:43:10 +1000 (AEST) Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=linux.alibaba.com (client-ip=115.124.30.98; helo=out30-98.freemail.mail.aliyun.com; envelope-from=jefflexu@linux.alibaba.com; receiver=lists.ozlabs.org) Received: from out30-98.freemail.mail.aliyun.com (out30-98.freemail.mail.aliyun.com [115.124.30.98]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4RPKwq6h82z2yD6 for ; Mon, 14 Aug 2023 13:42:51 +1000 (AEST) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R161e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046051;MF=jefflexu@linux.alibaba.com;NM=1;PH=DS;RN=2;SR=0;TI=SMTPD_---0VpepBJQ_1691984565; Received: from localhost(mailfrom:jefflexu@linux.alibaba.com fp:SMTPD_---0VpepBJQ_1691984565) by smtp.aliyun-inc.com; Mon, 14 Aug 2023 11:42:46 +0800 From: Jingbo Xu 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 Message-Id: <20230814034239.54660-6-jefflexu@linux.alibaba.com> X-Mailer: git-send-email 2.19.1.6.gb485710b In-Reply-To: <20230814034239.54660-1-jefflexu@linux.alibaba.com> References: <20230814034239.54660-1-jefflexu@linux.alibaba.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: linux-erofs@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development of Linux EROFS file system List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-erofs-bounces+linux-erofs=archiver.kernel.org@lists.ozlabs.org Sender: "Linux-erofs" Keep self allocated and maintained devname in erofs_sb_info. Signed-off-by: Jingbo Xu --- 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 #include #include #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