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

• Lines: 64
• Date: Sat Jul 8 19:26:12 2000
• Orig file: v2.4.0-test2/linux/fs/affs/inode.c
• Orig date: Fri Jun 23 21:55:10 2000

diff -u --recursive --new-file v2.4.0-test2/linux/fs/affs/inode.c linux/fs/affs/inode.c
@@ -27,6 +27,7 @@
 #include <linux/major.h>
 #include <linux/blkdev.h>
 #include <linux/init.h>
+#include <linux/smp_lock.h>
 #include <asm/system.h>
 #include <asm/uaccess.h>
 
@@ -191,7 +192,7 @@
 }
 
 void
-affs_write_inode(struct inode *inode)
+affs_write_inode(struct inode *inode, int unused)
 {
 	struct buffer_head	*bh;
 	struct file_end		*file_end;
@@ -202,8 +203,10 @@
 
 	if (!inode->i_nlink)
 		return;
+	lock_kernel();
 	if (!(bh = bread(inode->i_dev,inode->i_ino,AFFS_I2BSIZE(inode)))) {
 		affs_error(inode->i_sb,"write_inode","Cannot read block %lu",inode->i_ino);
+		unlock_kernel();
 		return;
 	}
 	file_end = GET_END_PTR(struct file_end, bh->b_data,AFFS_I2BSIZE(inode));
@@ -231,6 +234,7 @@
 	affs_fix_checksum(AFFS_I2BSIZE(inode),bh->b_data,5);
 	mark_buffer_dirty(bh,1);
 	brelse(bh);
+	unlock_kernel();
 }
 
 int
@@ -269,6 +273,7 @@
 	pr_debug("AFFS: put_inode(ino=%lu, nlink=%u)\n",
 		inode->i_ino,inode->i_nlink);
 
+	lock_kernel();
 	affs_free_prealloc(inode);
 	if (atomic_read(&inode->i_count) == 1) {
 		unsigned long cache_page = (unsigned long) inode->u.affs_i.i_ec;
@@ -278,16 +283,19 @@
 			free_page(cache_page);
 		}
 	}
+	unlock_kernel();
 }
 
 void
 affs_delete_inode(struct inode *inode)
 {
 	pr_debug("AFFS: delete_inode(ino=%lu, nlink=%u)\n",inode->i_ino,inode->i_nlink);
+	lock_kernel();
 	inode->i_size = 0;
 	if (S_ISREG(inode->i_mode) && !inode->u.affs_i.i_hlink)
 		affs_truncate(inode);
 	affs_free_block(inode->i_sb,inode->i_ino);
+	unlock_kernel();
 	clear_inode(inode);
 }