patch-2.1.45 linux/fs/ext2/ialloc.c

• Lines: 46
• Date: Wed Jul 16 11:25:42 1997
• Orig file: v2.1.44/linux/fs/ext2/ialloc.c
• Orig date: Mon Jun 16 16:35:57 1997

diff -u --recursive --new-file v2.1.44/linux/fs/ext2/ialloc.c linux/fs/ext2/ialloc.c
@@ -171,9 +171,8 @@
 		printk ("ext2_free_inode: inode has no device\n");
 		return;
 	}
-	if (atomic_read(&inode->i_count) > 1) {
-		printk ("ext2_free_inode: inode has count=%d\n",
-			atomic_read(&inode->i_count));
+	if (inode->i_count > 1) {
+		printk ("ext2_free_inode: inode has count=%d\n", inode->i_count);
 		return;
 	}
 	if (inode->i_nlink) {
@@ -216,7 +215,6 @@
 		es->s_free_inodes_count =
 			cpu_to_le32(le32_to_cpu(es->s_free_inodes_count) + 1);
 		mark_buffer_dirty(sb->u.ext2_sb.s_sbh, 1);
-		inode->i_dirt = 0;
 	}
 	mark_buffer_dirty(bh, 1);
 	if (sb->s_flags & MS_SYNCHRONOUS) {
@@ -240,7 +238,7 @@
 			       int mode)
 {
 	inode->u.ext2_i.i_version++;
-	inode->i_dirt = 1;
+	mark_inode_dirty(inode);
 
 	return;
 }
@@ -404,7 +402,6 @@
 	sb->s_dirt = 1;
 	inode->i_mode = mode;
 	inode->i_sb = sb;
-	atomic_set(&inode->i_count, 1);
 	inode->i_nlink = 1;
 	inode->i_dev = sb->s_dev;
 	inode->i_uid = current->fsuid;
@@ -416,7 +413,7 @@
 			mode |= S_ISGID;
 	} else
 		inode->i_gid = current->fsgid;
-	inode->i_dirt = 1;
+	mark_inode_dirty(inode);
 	inode->i_ino = j;
 	inode->i_blksize = PAGE_SIZE;	/* This is the optimal IO size (for stat), not the fs block size */
 	inode->i_blocks = 0;