Merge bk://bcrlbits.bkbits.net/linux-2.5

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

fs/inode.c

@@ -467,8 +467,7 @@ void write_inode_now(struct inode *inode, int sync)
 
 	if (sb) {
 		spin_lock(&inode_lock);
-		while (inode->i_state & I_DIRTY)
-			sync_one(inode, sync);
+		sync_one(inode, sync);
 		spin_unlock(&inode_lock);
 		if (sync)
 			wait_on_inode(inode);