---

yaml --- r: 165867 b: refs/heads/master c: 5aa98b7 h: refs/heads/master i: 165865: 0cfcca8 165863: 52a9e19 v: v3
git-mirror · Sep 24, 2009 · 64c8510 · 64c8510
1 parent b06bf42
commit 64c8510
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05cc0cee6948fc11985d11557fb130645a7f69a6
+refs/heads/master: 5aa98b706e83da4cde4172c890d6e815915536a0
diff --git a/trunk/fs/ioctl.c b/trunk/fs/ioctl.c
@@ -162,20 +162,21 @@ EXPORT_SYMBOL(fiemap_check_flags);
 static int fiemap_check_ranges(struct super_block *sb,
 			       u64 start, u64 len, u64 *new_len)
 {
+	u64 maxbytes = (u64) sb->s_maxbytes;
+
 	*new_len = len;
 
 	if (len == 0)
 		return -EINVAL;
 
-	if (start > sb->s_maxbytes)
+	if (start > maxbytes)
 		return -EFBIG;
 
 	/*
 	 * Shrink request scope to what the fs can actually handle.
 	 */
-	if ((len > sb->s_maxbytes) ||
-	    (sb->s_maxbytes - len) < start)
-		*new_len = sb->s_maxbytes - start;
+	if (len > maxbytes || (maxbytes - len) < start)
+		*new_len = maxbytes - start;
 
 	return 0;
 }