From patchwork Mon Feb 25 15:55:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kara X-Patchwork-Id: 222946 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 4B8312C02C0 for ; Tue, 26 Feb 2013 02:55:21 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759916Ab3BYPzT (ORCPT ); Mon, 25 Feb 2013 10:55:19 -0500 Received: from cantor2.suse.de ([195.135.220.15]:54879 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759881Ab3BYPzP (ORCPT ); Mon, 25 Feb 2013 10:55:15 -0500 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 8814FA4FFA; Mon, 25 Feb 2013 16:55:14 +0100 (CET) Received: by quack.suse.cz (Postfix, from userid 1000) id CBAFC20676; Mon, 25 Feb 2013 16:55:12 +0100 (CET) From: Jan Kara To: Ted Tso Cc: linux-ext4@vger.kernel.org, Jan Kara Subject: [PATCH 1/4] e2p: Fix 's' handling in parse_num_blocks2() Date: Mon, 25 Feb 2013 16:55:05 +0100 Message-Id: <1361807708-15871-2-git-send-email-jack@suse.cz> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1361807708-15871-1-git-send-email-jack@suse.cz> References: <1361807708-15871-1-git-send-email-jack@suse.cz> Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org parse_num_blocks2() wrongly did: num << 1; when log_block_size < 0. That is obviously wrong as such statement has no effect (and the compiler properly warns about it). Callers expect returned value to be in bytes when log_block_size < 0 so fix the statement accordingly. Signed-off-by: Jan Kara --- lib/e2p/parse_num.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/e2p/parse_num.c b/lib/e2p/parse_num.c index cb0dc5b..e8d6283 100644 --- a/lib/e2p/parse_num.c +++ b/lib/e2p/parse_num.c @@ -42,7 +42,7 @@ unsigned long long parse_num_blocks2(const char *arg, int log_block_size) break; case 's': if (log_block_size < 0) - num << 1; + num <<= 9; else num >>= (1+log_block_size); break;