Merge with Linux 2.1.131 and more MIPS goodies.

(Did I mention that CVS is buggy ...)

7 files changed, 24 insertions, 20 deletions

diff --git a/fs/minix/bitmap.c b/fs/minix/bitmap.c
index 49dde4e44..ded1ea371 100644
--- a/fs/minix/bitmap.c
+++ b/fs/minix/bitmap.c
@@ -249,7 +249,7 @@ struct inode * minix_new_inode(const struct inode * dir)
 		return NULL;
 	sb = dir->i_sb;
 	inode->i_sb = sb;
-	inode->i_flags = inode->i_sb->s_flags;
+	inode->i_flags = 0;
 	j = 8192;
 	bh = NULL;
 	for (i = 0; i < sb->u.minix_sb.s_imap_blocks; i++) {
diff --git a/fs/minix/dir.c b/fs/minix/dir.c
index dc3e63347..d7db754ff 100644
--- a/fs/minix/dir.c
+++ b/fs/minix/dir.c
@@ -55,7 +55,7 @@ struct inode_operations minix_dir_inode_operations = {
 	NULL,			/* readpage */
 	NULL,			/* writepage */
 	NULL,			/* bmap */
-	minix_truncate,		/* truncate */
+	NULL,			/* truncate */
 	NULL			/* permission */
 };
 
diff --git a/fs/minix/fsync.c b/fs/minix/fsync.c
index 44606d260..ef3d15db9 100644
--- a/fs/minix/fsync.c
+++ b/fs/minix/fsync.c
@@ -144,7 +144,7 @@ static int V1_sync_dindirect(struct inode *inode, unsigned short *diblock,
 	return err;
 }
 
-int V1_minix_sync_file(struct inode * inode, struct file * file)
+static int V1_minix_sync_file(struct inode * inode, struct file * file)
 {
 	int wait, err = 0;
 	
@@ -305,7 +305,7 @@ static int V2_sync_tindirect(struct inode *inode, unsigned long *tiblock,
 	return err;
 }
 
-int V2_minix_sync_file(struct inode * inode, struct file * file)
+static int V2_minix_sync_file(struct inode * inode, struct file * file)
 {
 	int wait, err = 0;
 	
diff --git a/fs/minix/inode.c b/fs/minix/inode.c
index 46ae5c11c..e8b1e7660 100644
--- a/fs/minix/inode.c
+++ b/fs/minix/inode.c
@@ -26,6 +26,11 @@
 
 #include <linux/minix_fs.h>
 
+static void minix_read_inode(struct inode * inode);
+static void minix_write_inode(struct inode * inode);
+static int minix_statfs(struct super_block *sb, struct statfs *buf, int bufsiz);
+static int minix_remount (struct super_block * sb, int * flags, char * data);
+
 static void minix_delete_inode(struct inode *inode)
 {
 	inode->i_size = 0;
@@ -40,7 +45,7 @@ static void minix_commit_super (struct super_block * sb,
 	sb->s_dirt = 0;
 }
 
-void minix_write_super (struct super_block * sb)
+static void minix_write_super (struct super_block * sb)
 {
 	struct minix_super_block * ms;
 
@@ -55,7 +60,7 @@ void minix_write_super (struct super_block * sb)
 }
 
 
-void minix_put_super(struct super_block *sb)
+static void minix_put_super(struct super_block *sb)
 {
 	int i;
 
@@ -86,7 +91,7 @@ static struct super_operations minix_sops = {
 	minix_remount
 };
 
-int minix_remount (struct super_block * sb, int * flags, char * data)
+static int minix_remount (struct super_block * sb, int * flags, char * data)
 {
 	struct minix_super_block * ms;
 
@@ -162,7 +167,7 @@ static const char * minix_checkroot(struct super_block *s, struct inode *dir)
 	return errmsg;
 }
 
-struct super_block *minix_read_super(struct super_block *s, void *data,
+static struct super_block *minix_read_super(struct super_block *s, void *data,
 				     int silent)
 {
 	struct buffer_head *bh;
@@ -326,7 +331,7 @@ out_bad_sb:
 	return NULL;
 }
 
-int minix_statfs(struct super_block *sb, struct statfs *buf, int bufsiz)
+static int minix_statfs(struct super_block *sb, struct statfs *buf, int bufsiz)
 {
 	struct statfs tmp;
 
@@ -830,7 +835,7 @@ static void V2_minix_read_inode(struct inode * inode)
 /*
  * The global function to read an inode.
  */
-void minix_read_inode(struct inode * inode)
+static void minix_read_inode(struct inode * inode)
 {
 	if (INODE_VERSION(inode) == MINIX_V1)
 		V1_minix_read_inode(inode);
@@ -916,7 +921,7 @@ static struct buffer_head * V2_minix_update_inode(struct inode * inode)
 	return bh;
 }
 
-struct buffer_head *minix_update_inode(struct inode *inode)
+static struct buffer_head *minix_update_inode(struct inode *inode)
 {
 	if (INODE_VERSION(inode) == MINIX_V1)
 		return V1_minix_update_inode(inode);
@@ -924,7 +929,7 @@ struct buffer_head *minix_update_inode(struct inode *inode)
 		return V2_minix_update_inode(inode);
 }
 
-void minix_write_inode(struct inode * inode)
+static void minix_write_inode(struct inode * inode)
 {
 	struct buffer_head *bh;
 
diff --git a/fs/minix/namei.c b/fs/minix/namei.c
index 17ff53aed..ad2211d25 100644
--- a/fs/minix/namei.c
+++ b/fs/minix/namei.c
@@ -88,7 +88,7 @@ static int minix_hash(struct dentry *dentry, struct qstr *qstr)
 {
 	unsigned long hash;
 	int i;
-	const char *name;
+	const unsigned char *name;
 
 	i = dentry->d_inode->i_sb->u.minix_sb.s_namelen;
 	if (i >= qstr->len)
@@ -452,7 +452,7 @@ int minix_rmdir(struct inode * dir, struct dentry *dentry)
 		retval = -ENOENT;
 		goto end_rmdir;
 	}
-	if (dentry->d_count > 1) {
+	if (!list_empty(&dentry->d_hash)) {
 		retval = -EBUSY;
 		goto end_rmdir;
 	}
@@ -490,8 +490,6 @@ repeat:
 	inode = dentry->d_inode;
 
 	retval = -EPERM;
-	if (S_ISDIR(inode->i_mode))
-		goto end_unlink;
 	if (de->inode != inode->i_ino) {
 		brelse(bh);
 		current->counter = 0;
diff --git a/fs/minix/symlink.c b/fs/minix/symlink.c
index cdc237235..4f3661105 100644
--- a/fs/minix/symlink.c
+++ b/fs/minix/symlink.c
@@ -15,7 +15,7 @@
 #include <asm/uaccess.h>
 
 static int minix_readlink(struct dentry *, char *, int);
-static struct dentry *minix_follow_link(struct dentry *, struct dentry *);
+static struct dentry *minix_follow_link(struct dentry *, struct dentry *, unsigned int);
 
 /*
  * symlinks can't do much...
@@ -41,7 +41,8 @@ struct inode_operations minix_symlink_inode_operations = {
 };
 
 static struct dentry * minix_follow_link(struct dentry * dentry,
-					struct dentry * base)
+					struct dentry * base,
+					unsigned int follow)
 {
 	struct inode *inode = dentry->d_inode;
 	struct buffer_head * bh;
@@ -52,7 +53,7 @@ static struct dentry * minix_follow_link(struct dentry * dentry,
 		return ERR_PTR(-EIO);
 	}
 	UPDATE_ATIME(inode);
-	base = lookup_dentry(bh->b_data, base, 1);
+	base = lookup_dentry(bh->b_data, base, follow);
 	brelse(bh);
 	return base;
 }
diff --git a/fs/minix/truncate.c b/fs/minix/truncate.c
index 0f0afa604..a94806fdf 100644
--- a/fs/minix/truncate.c
+++ b/fs/minix/truncate.c
@@ -176,7 +176,7 @@ repeat:
 	return retry;
 }
 
-void V1_minix_truncate(struct inode * inode)
+static void V1_minix_truncate(struct inode * inode)
 {
 	int retry;