From patchwork Mon Oct 8 23:39:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: nicholas.clark@gmail.com X-Patchwork-Id: 980934 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="qcJTzE5r"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42TcKb5RVhzB3sq for ; Tue, 9 Oct 2018 10:40:03 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725828AbeJIGyK (ORCPT ); Tue, 9 Oct 2018 02:54:10 -0400 Received: from mail-it1-f194.google.com ([209.85.166.194]:40211 "EHLO mail-it1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725759AbeJIGyK (ORCPT ); Tue, 9 Oct 2018 02:54:10 -0400 Received: by mail-it1-f194.google.com with SMTP id i191-v6so62263iti.5 for ; Mon, 08 Oct 2018 16:40:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Y1cABKQyBcECOGK+U89uifmbTGuIEOaxXGYyd0I4oSw=; b=qcJTzE5rJAJfA2zXDZoApI3lj9WKeHA+T8OQKZn9gOrNwBdtKDZm6BALxDlOuQv3oL Aj7UrocgBmXuaBUMNbMP17NRTBJHkQVSAM7gSOYo6+250sbBy+WeY41BUW9a8EUFNvGj 630RHLrmiiXPgj/VDDr4yVYqKOKtGdkpSpJhno5/9/DTTOmEcjBya9w4fZA7muHBeheG gmDUi1sePLjXw7CwnBg5mWRjZN1lDpkCTAJYdxMPs768gCWgTPzXR1rd6qbTR8wTQMa4 tFkY3Gc6k2MIByAUo77FJ3blTjaRpZP+k7VHsNtnhwU0WjWdjAGkgbO2gUmE9Z7ZKUm0 htTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Y1cABKQyBcECOGK+U89uifmbTGuIEOaxXGYyd0I4oSw=; b=QSRxcdrH+oAmtocDBsXcTxQv2oIPEOCHi8KMQ2tTdJqzlYU28GNCb/UVxDZTCIgBZM 6Y00bXQqRJrpepDXnK8xeYeyjx0y8ra8rDWnfiax/qcsZ+xmL6QqBK2mMun7ABSYDsTW x7XzrvqZ/o3MrAjbFKrhi9LX1F4W9MQ1gg5EICyauTOP3F6uyVcxT2YLPHdy4HYqWJ6n vh9rxqY/hMu4e3spnEngY570mIDmlqAncF+l8Ll5rtyRRhzSqsg4qq+zswgWt/dnBmT0 JYh9AMH6I2jpKl97hbB4rnBQtX7+Mz0wEqNUYz5d3fcLCH5OhL+TIB6xafua6nxQdQ3n iiZQ== X-Gm-Message-State: ABuFfogeaAwbf62jwo/4QDHYvvLGQHF9+2QmBG9msBHfQ+OgdPC2tsA/ Ja+KbKQS6W4shGLZ0vlOVddJoUH9 X-Google-Smtp-Source: ACcGV61PQhBhWr66BUefFOSquknyHeOI20XUykwEXemEMCuiMCDttaBEKfUZUPZgQLkQIFtKhLQScA== X-Received: by 2002:a05:660c:243:: with SMTP id t3mr90926itk.146.1539042001203; Mon, 08 Oct 2018 16:40:01 -0700 (PDT) Received: from localhost.localdomain.localdomain (97-122-193-216.hlrn.qwest.net. [97.122.193.216]) by smtp.gmail.com with ESMTPSA id v26-v6sm5735119iog.12.2018.10.08.16.40.00 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Oct 2018 16:40:00 -0700 (PDT) From: nicholas.clark@gmail.com To: linux-ext4@vger.kernel.org Cc: Nicholas Clark Subject: [PATCH 1/2] Fuse2fs: fix 'mount' entry in some cases. Date: Mon, 8 Oct 2018 17:39:51 -0600 Message-Id: <20181008233952.20965-2-nicholas.clark@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181008233952.20965-1-nicholas.clark@gmail.com> References: <20181008233952.20965-1-nicholas.clark@gmail.com> Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Nicholas Clark 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 Reviewed-by: Darrick J. Wong --- 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);