From patchwork Thu May 12 16:22:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Marcus_H=C3=BCwe?= X-Patchwork-Id: 621666 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3r5JDx1Lxjz9sds for ; Fri, 13 May 2016 02:22:57 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752444AbcELQW4 (ORCPT ); Thu, 12 May 2016 12:22:56 -0400 Received: from mout.gmx.net ([212.227.17.22]:57545 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752405AbcELQWz (ORCPT ); Thu, 12 May 2016 12:22:55 -0400 Received: from localhost ([79.203.17.212]) by mail.gmx.com (mrgmx101) with ESMTPSA (Nemesis) id 0LvhC4-1bfURz1lYC-017Tyn; Thu, 12 May 2016 18:22:51 +0200 Date: Thu, 12 May 2016 18:22:50 +0200 From: Marcus Huewe To: tytso@mit.edu Cc: linux-ext4@vger.kernel.org Subject: [PATCH 2/2] mke2fs: fix filesystem size calculation, if an offset is specified Message-ID: <20160512162250.GA4662@linux> Mail-Followup-To: tytso@mit.edu, linux-ext4@vger.kernel.org MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) X-Provags-ID: V03:K0:1xwQHbU7mOLFSeoSNAWpgRniCeoFHXVK/Ce7J40rvVSYAV4HbKX KYQtZepwmPA+28GM5beKAXi1Jb/gk1hDlQJSd/neBdT5aXCbnEJoaWU6MIROV5xLA5otdZG D0GvbKOjyEythkw7Woi8Lhr4LbwK8a2KrEdFE/gl589f4bYjr6oMFEydVB4K9v0ae1FEnHS C1gt4a6ocKTOBXUhhoNlg== X-UI-Out-Filterresults: notjunk:1; V01:K0:SCOsABNcTq4=:yIw6XEdUYk4F6LQtYnAnsi 5m5kJMm+3GOgAv26p9ic0fI9+Nmh8Ks71F0//lL2UqC9P16AW81p9YpKHYkWSARaIaHP/+msk sxss18u5/yvpvipB9bKrhsKUBJFqGmOPJUHNHVX0fbMMXvPm17HNa/d8kR/WO+101Z2qQNITv BzZBu3+2YMXdNSr9XZzKzsR+S+aPfBOdrlltpZb7pK+uRsW2rjRt2sFo2Rt5c1gLfI7rUk/Fl PpU3auVlJF2qu/z1OmlKj8LzI2yLdGHJ9YAKE5kydYLvujrtCfCYLOKwU2OyyZbAVsszfy0kR xmTl8vt8DBKbhNNdZQHBorK5o1s4JV2h0A7wN2lgwShtQjhuG4izO22JKZMRQagorwWiZbiqF Bc9XCTwVr9PGczdVskDWhD78+4YCVwNgUDShFG8OycI+NR1zDDaIJTMJe6BACz7dInhIdV1Mc rSJB4cJbCOQjTvB5+RJpD1iPHC57CXSv4f3rU3WsVxQzfq/HfZEGi8bGw3BUANoJmDWYB5ROW wff7EpBpzh5W/FV22Xh7WZV/ofeGtc6oLuJb7hF0K9xRz11pEoD1b7PgRLU6nt4vfZYCEbt7G 7eyNkCB3RK2FmeebJt98vSzUlbU/mF2j/Fhb1tXHMl+SiBgJTeqObEH8+dPtPZHANpeCP/sCR Kvn1zkb/eFetcWesGd9TZoA5A6wFJFQayDOX7EAbX6mGEE3hPUqMmOEmaEkrME2ZD4PEbaIVE EEkDZYf3Sz99l3sn1IOuuurHC7NiHOEsY5Z56VlR9Z06u8moJUeYIIyvq8U= Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org If a filesystem size is explicitly specified, it should be used without subtracting the offset. Signed-off-by: Marcus Huewe --- misc/mke2fs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/misc/mke2fs.c b/misc/mke2fs.c index dd5bb35..e0a98e7 100644 --- a/misc/mke2fs.c +++ b/misc/mke2fs.c @@ -1874,6 +1874,8 @@ profile_error: flags |= VERBOSE_CREATE; if (fs_blocks_count == 0) flags |= NO_SIZE; + else + explicit_fssize = 1; if (!check_plausibility(device_name, flags, &is_device) && !force) proceed_question(proceed_delay); @@ -1881,7 +1883,6 @@ profile_error: /* Determine the size of the device (if possible) */ if (noaction && fs_blocks_count) { - explicit_fssize = 1; dev_size = fs_blocks_count; retval = 0; } else