--- linux-2.4.21-pre3-rmap-ext3merge/fs/ext3/inode.c.=K0025=.orig	2003-01-23 16:30:32.000000000 +0000
+++ linux-2.4.21-pre3-rmap-ext3merge/fs/ext3/inode.c	2003-01-23 16:30:32.000000000 +0000
@@ -2540,32 +2540,6 @@
 }
 
 
-/* 
- * This function is going away --- ext3_reserve_inode_write is now
- * enough to guarantee a deferred, consistent inode flush once the
- * transaction commits.
- */
-int
-ext3_mark_iloc_dirty(handle_t *handle, 
-		     struct inode *inode,
-		     struct ext3_iloc *iloc)
-{
-	return ext3_mark_inode_dirty(handle, inode);
-}
-
-/* 
- * This function is also going away: mark_inode_write() is now enough,
- * because the resulting call to ext3_dirty_inode will do all that we
- * need it to do. 
- */
-
-int
-ext3_reserve_inode_write(handle_t *handle, struct inode *inode, 
-			 struct ext3_iloc *iloc)
-{
-	return 0;
-}
-
 /*
  *
  * On success, we end up with an outstanding reference
--- linux-2.4.21-pre3-rmap-ext3merge/fs/ext3/ioctl.c.=K0025=.orig	2003-01-23 16:30:32.000000000 +0000
+++ linux-2.4.21-pre3-rmap-ext3merge/fs/ext3/ioctl.c	2003-01-23 16:32:22.000000000 +0000
@@ -29,7 +29,6 @@
 	case EXT3_IOC_SETFLAGS: {
 		handle_t *handle = NULL;
 		int err;
-		struct ext3_iloc iloc;
 		unsigned int oldflags;
 		unsigned int jflag;
 
@@ -73,9 +72,6 @@
 			return PTR_ERR(handle);
 		if (IS_SYNC(inode))
 			handle->h_sync = 1;
-		err = ext3_reserve_inode_write(handle, inode, &iloc);
-		if (err)
-			goto flags_err;
 		
 		flags = flags & EXT3_FL_USER_MODIFIABLE;
 		flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE;
@@ -99,8 +95,7 @@
 			inode->i_flags &= ~S_NOATIME;
 		inode->i_ctime = CURRENT_TIME;
 
-		err = ext3_mark_iloc_dirty(handle, inode, &iloc);
-flags_err:
+		err = ext3_mark_inode_dirty(handle, inode);
 		ext3_journal_stop(handle, inode);
 		if (err)
 			return err;
@@ -115,7 +110,6 @@
 	case EXT3_IOC_SETVERSION:
 	case EXT3_IOC_SETVERSION_OLD: {
 		handle_t *handle;
-		struct ext3_iloc iloc;
 		__u32 generation;
 		int err;
 
@@ -129,14 +123,11 @@
 		handle = ext3_journal_start(inode, 1);
 		if (IS_ERR(handle))
 			return PTR_ERR(handle);
-		err = ext3_reserve_inode_write(handle, inode, &iloc);
-		if (err)
-			return err;
 
 		inode->i_ctime = CURRENT_TIME;
 		inode->i_generation = generation;
 
-		err = ext3_mark_iloc_dirty(handle, inode, &iloc);
+		err = ext3_mark_inode_dirty(handle, inode);
 		ext3_journal_stop(handle, inode);
 		return err;
 	}
--- linux-2.4.21-pre3-rmap-ext3merge/fs/ext3/namei.c.=K0025=.orig	2003-01-23 16:30:32.000000000 +0000
+++ linux-2.4.21-pre3-rmap-ext3merge/fs/ext3/namei.c	2003-01-23 16:32:22.000000000 +0000
@@ -1747,7 +1747,6 @@
 int ext3_orphan_add(handle_t *handle, struct inode *inode)
 {
 	struct super_block *sb = inode->i_sb;
-	struct ext3_iloc iloc;
 	int err = 0, rc;
 	
 	lock_super(sb);
@@ -1771,15 +1770,11 @@
 	if (err)
 		goto out_unlock;
 	
-	err = ext3_reserve_inode_write(handle, inode, &iloc);
-	if (err)
-		goto out_unlock;
-
 	/* Insert this inode at the head of the on-disk orphan list... */
 	NEXT_ORPHAN(inode) = le32_to_cpu(EXT3_SB(sb)->s_es->s_last_orphan);
 	EXT3_SB(sb)->s_es->s_last_orphan = cpu_to_le32(inode->i_ino);
 	err = ext3_journal_dirty_metadata(handle, sb->u.ext3_sb.s_sbh);
-	rc = ext3_mark_iloc_dirty(handle, inode, &iloc);
+	rc = ext3_mark_inode_dirty(handle, inode);
 	if (!err)
 		err = rc;
 
@@ -1813,7 +1808,6 @@
 	struct ext3_inode_info *ei = EXT3_I(inode);
 	struct ext3_sb_info *sbi;
 	unsigned long ino_next;
-	struct ext3_iloc iloc;
 	int err = 0;
 
 	lock_super(inode->i_sb);
@@ -1838,47 +1832,33 @@
 	if (!handle)
 		goto out;
 
-	err = ext3_reserve_inode_write(handle, inode, &iloc);
-	if (err)
-		goto out_err;
-
 	if (prev == &sbi->s_orphan) {
 		jbd_debug(4, "superblock will point to %lu\n", ino_next);
 		BUFFER_TRACE(sbi->s_sbh, "get_write_access");
 		err = ext3_journal_get_write_access(handle, sbi->s_sbh);
 		if (err)
-			goto out_brelse;
+			goto out_err;
 		sbi->s_es->s_last_orphan = cpu_to_le32(ino_next);
 		err = ext3_journal_dirty_metadata(handle, sbi->s_sbh);
 	} else {
-		struct ext3_iloc iloc2;
 		struct inode *i_prev =
 			list_entry(prev, struct inode, u.ext3_i.i_orphan);
 
 		jbd_debug(4, "orphan inode %lu will point to %lu\n",
 			  i_prev->i_ino, ino_next);
-		err = ext3_reserve_inode_write(handle, i_prev, &iloc2);
-		if (err)
-			goto out_brelse;
 		NEXT_ORPHAN(i_prev) = ino_next;
-		err = ext3_mark_iloc_dirty(handle, i_prev, &iloc2);
+		err = ext3_mark_inode_dirty(handle, i_prev);
 	}
 	if (err)
-		goto out_brelse;
+		goto out_err;
 	NEXT_ORPHAN(inode) = 0;
-	err = ext3_mark_iloc_dirty(handle, inode, &iloc);
-	if (err)
-		goto out_brelse;
+	err = ext3_mark_inode_dirty(handle, inode);
 
 out_err:
 	ext3_std_error(inode->i_sb, err);
 out:
 	unlock_super(inode->i_sb);
 	return err;
-
-out_brelse:
-	brelse(iloc.bh);
-	goto out_err;
 }
 
 static int ext3_rmdir (struct inode * dir, struct dentry *dentry)