From: Theodore Ts'o <tytso@mit.edu>
Date: Sun, 9 Oct 2011 22:18:01 +0000 (-0400)
Subject: filefrag: fix infinite loop in filefrag
X-Git-Tag: android-x86-6.0-r1~26^2~580
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=605cf6edaf6fce6a3810cda24c6ceca90af1a096;p=android-x86%2Fexternal-e2fsprogs.git

filefrag: fix infinite loop in filefrag

Commit a00be17e4768 was missing a patch hunk needed to prevent
filefrag from looping forever when it is run without the -v option.

Addresses-Debian-Bug: #644792

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---

diff --git a/misc/filefrag.c b/misc/filefrag.c
index 324506a3..0583e916 100644
--- a/misc/filefrag.c
+++ b/misc/filefrag.c
@@ -181,13 +181,6 @@ static int filefrag_fiemap(int fd, int blk_shift, int *num_extents)
 
 	memset(fiemap, 0, sizeof(struct fiemap));
 
-	/*
-	 * If count (and therefore fm_extent_count) == 0, FIEMAP
-	 * returns count of extents found without filling in details.
-	 */
-	if (!verbose)
-		count = 0;
-
 	if (sync_file)
 		flags |= FIEMAP_FLAG_SYNC;