patch-2.4.0-test3 linux/fs/fat/inode.c

• Lines: 70
• Date: Sun Jul 9 18:05:40 2000
• Orig file: v2.4.0-test2/linux/fs/fat/inode.c
• Orig date: Thu May 11 15:30:08 2000

diff -u --recursive --new-file v2.4.0-test2/linux/fs/fat/inode.c linux/fs/fat/inode.c
@@ -27,6 +27,7 @@
 #include <linux/locks.h>
 #include <linux/fat_cvf.h>
 #include <linux/malloc.h>
+#include <linux/smp_lock.h>
 
 #include "msbuffer.h"
 
@@ -153,17 +154,21 @@
 
 void fat_delete_inode(struct inode *inode)
 {
+	lock_kernel();
 	inode->i_size = 0;
 	fat_truncate(inode);
+	unlock_kernel();
 	clear_inode(inode);
 }
 
 void fat_clear_inode(struct inode *inode)
 {
+	lock_kernel();
 	spin_lock(&fat_inode_lock);
 	fat_cache_inval_inode(inode);
 	list_del(&MSDOS_I(inode)->i_fat_hash);
 	spin_unlock(&fat_inode_lock);
+	unlock_kernel();
 }
 
 void fat_put_super(struct super_block *sb)
@@ -837,7 +842,7 @@
 	MSDOS_I(inode)->i_ctime_ms = de->ctime_ms;
 }
 
-void fat_write_inode(struct inode *inode)
+void fat_write_inode(struct inode *inode, int wait)
 {
 	struct super_block *sb = inode->i_sb;
 	struct buffer_head *bh;
@@ -846,16 +851,21 @@
 
 retry:
 	i_pos = MSDOS_I(inode)->i_location;
-	if (inode->i_ino == MSDOS_ROOT_INO || !i_pos) return;
+	if (inode->i_ino == MSDOS_ROOT_INO || !i_pos) {
+		return;
+	}
+	lock_kernel();
 	if (!(bh = fat_bread(sb, i_pos >> MSDOS_DPB_BITS))) {
 		printk("dev = %s, ino = %d\n", kdevname(inode->i_dev), i_pos);
 		fat_fs_panic(sb, "msdos_write_inode: unable to read i-node block");
+		unlock_kernel();
 		return;
 	}
 	spin_lock(&fat_inode_lock);
 	if (i_pos != MSDOS_I(inode)->i_location) {
 		spin_unlock(&fat_inode_lock);
 		fat_brelse(sb, bh);
+		unlock_kernel();
 		goto retry;
 	}
 
@@ -885,6 +895,7 @@
 	spin_unlock(&fat_inode_lock);
 	fat_mark_buffer_dirty(sb, bh, 1);
 	fat_brelse(sb, bh);
+	unlock_kernel();
 }