[1/2] Fuse2fs: fix 'mount' entry in some cases.

Message ID 20181008233952.20965-2-nicholas.clark@gmail.com
State New
Headers show
Series
  • e2fsprogs: fuse2fs bugfix and new 'fakeroot' feature
Related show

Commit Message

nicholas.clark@gmail.com Oct. 8, 2018, 11:39 p.m.
From: Nicholas Clark <nicholas.clark@gmail.com>

FUSE's parser allows command-line options to be specified before
or after the device/image and mount-path. This commit changes the
value of the fsname mount option to be correct even if options are
specified before the target device/image.

Signed-off-by: Nicholas Clark <nicholas.clark@gmail.com>
---
 misc/fuse2fs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Darrick J. Wong Oct. 9, 2018, 12:23 a.m. | #1
On Mon, Oct 08, 2018 at 05:39:51PM -0600, nicholas.clark@gmail.com wrote:
> From: Nicholas Clark <nicholas.clark@gmail.com>
> 
> FUSE's parser allows command-line options to be specified before
> or after the device/image and mount-path. This commit changes the
> value of the fsname mount option to be correct even if options are
> specified before the target device/image.
> 
> Signed-off-by: Nicholas Clark <nicholas.clark@gmail.com>

Looks ok,
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>

--D

> ---
>  misc/fuse2fs.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/misc/fuse2fs.c b/misc/fuse2fs.c
> index 5c73895e..3214be4a 100644
> --- a/misc/fuse2fs.c
> +++ b/misc/fuse2fs.c
> @@ -3845,7 +3845,7 @@ int main(int argc, char *argv[])
>  	/* Set up default fuse parameters */
>  	snprintf(extra_args, BUFSIZ, "-okernel_cache,subtype=ext4,use_ino,"
>  		 "fsname=%s,attr_timeout=0" FUSE_PLATFORM_OPTS,
> -		 argv[1]);
> +		 fctx.device);
>  	if (fctx.no_default_opts == 0)
>  		fuse_opt_add_arg(&args, extra_args);
>  
> -- 
> 2.17.1
>

Patch

diff --git a/misc/fuse2fs.c b/misc/fuse2fs.c
index 5c73895e..3214be4a 100644
--- a/misc/fuse2fs.c
+++ b/misc/fuse2fs.c
@@ -3845,7 +3845,7 @@  int main(int argc, char *argv[])
 	/* Set up default fuse parameters */
 	snprintf(extra_args, BUFSIZ, "-okernel_cache,subtype=ext4,use_ino,"
 		 "fsname=%s,attr_timeout=0" FUSE_PLATFORM_OPTS,
-		 argv[1]);
+		 fctx.device);
 	if (fctx.no_default_opts == 0)
 		fuse_opt_add_arg(&args, extra_args);