Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/wireless/rt2x00/rt2x00dev.c
	net/8021q/vlan_dev.c

1 files changed, 1 insertions, 1 deletions

diff --git a/fs/xfs/xfs_ialloc.c b/fs/xfs/xfs_ialloc.c
index c5836b951d0c..db9d5fa600af 100644
--- a/fs/xfs/xfs_ialloc.c
+++ b/fs/xfs/xfs_ialloc.c
@@ -1053,7 +1053,7 @@ xfs_difree(
         /*
          * When an inode cluster is free, it becomes eligible for removal
          */
-        if ((mp->m_flags & XFS_MOUNT_IDELETE) &&
+        if (!(mp->m_flags & XFS_MOUNT_IKEEP) &&
             (rec.ir_freecount == XFS_IALLOC_INODES(mp))) {
 
                 *delete = 1;