--- linux/fs/minix/namei.c	2018/04/24 18:03:52	1.1
+++ linux/fs/minix/namei.c	2018/04/24 18:06:06	1.1.1.2
@@ -15,10 +15,6 @@
 #include <const.h>
 #include <sys/stat.h>
 
-extern int permission(struct inode * inode,int mask);
-extern struct inode * _namei(const char * filename, struct inode * base,
-	int follow_links);
-
 /*
  * comment out this line if you want names > MINIX_NAME_LEN chars to be
  * truncated. Else they will be disallowed.
@@ -89,7 +85,7 @@ static struct buffer_head * minix_find_e
 		if ((char *)de >= BLOCK_SIZE+bh->b_data) {
 			brelse(bh);
 			bh = NULL;
-			if (!(block = bmap(dir,i/MINIX_DIR_ENTRIES_PER_BLOCK)) ||
+			if (!(block = minix_bmap(dir,i/MINIX_DIR_ENTRIES_PER_BLOCK)) ||
 			    !(bh = bread(dir->i_dev,block))) {
 				i += MINIX_DIR_ENTRIES_PER_BLOCK;
 				continue;
@@ -398,7 +394,7 @@ static int empty_dir(struct inode * inod
 	while (nr<len) {
 		if ((void *) de >= (void *) (bh->b_data+BLOCK_SIZE)) {
 			brelse(bh);
-			block=bmap(inode,nr/MINIX_DIR_ENTRIES_PER_BLOCK);
+			block = minix_bmap(inode,nr/MINIX_DIR_ENTRIES_PER_BLOCK);
 			if (!block) {
 				nr += MINIX_DIR_ENTRIES_PER_BLOCK;
 				continue;