From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Price Date: Mon, 7 Nov 2011 14:05:29 +0000 Subject: [Cluster-devel] [PATCH] mkfs.gfs2: Some minor cleanups Message-ID: <1320674729-18313-1-git-send-email-anprice@redhat.com> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit - The -K option isn't currently parsed, add it to the getopt option string. - Variable 'input' is defined but not used, remove it. - Add back reporting of the current device contents. - Don't call the discard blocks ioctl on regular files. Signed-off-by: Andrew Price --- gfs2/mkfs/main_mkfs.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gfs2/mkfs/main_mkfs.c b/gfs2/mkfs/main_mkfs.c index 6de1d12..eeff47b 100644 --- a/gfs2/mkfs/main_mkfs.c +++ b/gfs2/mkfs/main_mkfs.c @@ -109,7 +109,7 @@ static void decode_arguments(int argc, char *argv[], struct gfs2_sbd *sdp) sdp->orig_fssize = 0; while (cont) { - optchar = getopt(argc, argv, "-b:c:DhJ:j:Op:qr:t:u:VX"); + optchar = getopt(argc, argv, "-b:c:DhJ:j:KOp:qr:t:u:VX"); switch (optchar) { case 'b': @@ -325,7 +325,6 @@ static void are_you_sure(void) static void verify_bsize(struct gfs2_sbd *sdp) { unsigned int x; - char input[32]; /* Block sizes must be a power of two from 512 to 65536 */ @@ -561,8 +560,11 @@ void main_mkfs(int argc, char *argv[]) exit(EXIT_FAILURE); } - if (!sdp->override) + if (!sdp->override) { + printf( _("This will destroy any data on %s.\n"), sdp->device_name); + check_dev_content(sdp->device_name); are_you_sure(); + } if (!S_ISREG(st_buf.st_mode) && device_topology(sdp)) { perror(_("Device topology error\n")); @@ -621,7 +623,7 @@ void main_mkfs(int argc, char *argv[]) exit(EXIT_FAILURE); } - if (discard) + if (!S_ISREG(st_buf.st_mode) && discard) discard_blocks(sdp); /* Compute the resource group layouts */ -- 1.7.6.4