Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3af13763 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

[PATCH] fs/ext3/: small cleanups 



This patch contains the following cleanups:
- there's no need for ext3_count_free() #ifndef EXT3FS_DEBUG
- having prototypes for ext3_count_free() in two different headers is
  nonsense

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4610a6be

fs/ext3/balloc.c

+0 −2
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ 
#include <linux/quotaops.h>

#include <linux/buffer_head.h>



#include "bitmap.h"



/*

 * balloc.c contains the blocks allocation and deallocation routines

 */

fs/ext3/bitmap.c

+7 −1
Original line number Diff line number Diff line
@@ -7,8 +7,11 @@ 
 * Universite Pierre et Marie Curie (Paris VI)

 */



#ifdef EXT3FS_DEBUG



#include <linux/buffer_head.h>

#include "bitmap.h"



#include "ext3_fs.h"



static int nibblemap[] = {4, 3, 3, 2, 3, 2, 2, 1, 3, 2, 2, 1, 2, 1, 1, 0};
@@ -24,3 +27,6 @@ unsigned long ext3_count_free (struct buffer_head * map, unsigned int numchars) 
			nibblemap[(map->b_data[i] >> 4) & 0xf];

	return (sum);

}



#endif  /*  EXT3FS_DEBUG  */

fs/ext3/bitmap.h

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
/*  linux/fs/ext3/bitmap.c

 *

 * Copyright (C) 2005 Simtec Electronics

 *	Ben Dooks <ben@simtec.co.uk>

 *

*/



extern unsigned long ext3_count_free (struct buffer_head *, unsigned int );

fs/ext3/ialloc.c

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 


#include <asm/byteorder.h>



#include "bitmap.h"

#include "xattr.h"

#include "acl.h"