From patchwork Sun Mar 11 19:33:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Theodore Ts'o X-Patchwork-Id: 146003 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 10050B6EF3 for ; Mon, 12 Mar 2012 06:33:28 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751400Ab2CKTdP (ORCPT ); Sun, 11 Mar 2012 15:33:15 -0400 Received: from li9-11.members.linode.com ([67.18.176.11]:36475 "EHLO test.thunk.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751347Ab2CKTdP (ORCPT ); Sun, 11 Mar 2012 15:33:15 -0400 Received: from root (helo=tytso-glaptop.cam.corp.google.com) by test.thunk.org with local-esmtp (Exim 4.69) (envelope-from ) id 1S6oW2-0006hx-KH; Sun, 11 Mar 2012 19:33:14 +0000 Received: from tytso by tytso-glaptop.cam.corp.google.com with local (Exim 4.71) (envelope-from ) id 1S6oW1-0005nh-4q; Sun, 11 Mar 2012 15:33:13 -0400 From: Theodore Ts'o To: Ext4 Developers List Cc: lczerner@redhat.com, "Theodore Ts'o" Subject: [PATCH 1/3] e2fsck: remove last argument from e2fsck_discard_blocks() Date: Sun, 11 Mar 2012 15:33:11 -0400 Message-Id: <1331494393-21577-1-git-send-email-tytso@mit.edu> X-Mailer: git-send-email 1.7.9.107.g97f9a In-Reply-To: <20120311191836.GD1048@thunk.org> References: <20120311191836.GD1048@thunk.org> X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: tytso@thunk.org X-SA-Exim-Scanned: No (on test.thunk.org); SAEximRunCond expanded to false Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Lukas Czerner Simple code cleanup. Signed-off-by: "Theodore Ts'o" --- e2fsck/pass5.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/e2fsck/pass5.c b/e2fsck/pass5.c index 9a6a4b0..ca438cb 100644 --- a/e2fsck/pass5.c +++ b/e2fsck/pass5.c @@ -74,8 +74,8 @@ void e2fsck_pass5(e2fsck_t ctx) print_resource_track(ctx, _("Pass 5"), &rtrack, ctx->fs->io); } -static void e2fsck_discard_blocks(e2fsck_t ctx, io_manager manager, - blk64_t start, blk64_t count) +static void e2fsck_discard_blocks(e2fsck_t ctx, blk64_t start, + blk64_t count) { ext2_filsys fs = ctx->fs; @@ -85,7 +85,7 @@ static void e2fsck_discard_blocks(e2fsck_t ctx, io_manager manager, * not enough to fix the problem, hence it is not safe to run discard * in this case. */ - if (ext2fs_test_changed(ctx->fs)) + if (ext2fs_test_changed(fs)) ctx->options &= ~E2F_OPT_DISCARD; if (!(ctx->options & E2F_OPT_NO) && @@ -137,7 +137,7 @@ static void e2fsck_discard_inodes(e2fsck_t ctx, int group, num = count / EXT2_INODES_PER_BLOCK(fs->super); if (num > 0) - e2fsck_discard_blocks(ctx, fs->io->manager, blk, num); + e2fsck_discard_blocks(ctx, blk, num); } #define NO_BLK ((blk64_t) -1) @@ -379,7 +379,7 @@ redo_counts: first_free = i; } else { if (i > first_free) - e2fsck_discard_blocks(ctx, manager, first_free, + e2fsck_discard_blocks(ctx, first_free, (i - first_free)); first_free = ext2fs_blocks_count(fs->super); }