summaryrefslogtreecommitdiff
path: root/fs/xfs/xfs_ialloc.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-29 08:40:21 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-29 08:40:21 -0800
commit3cf9460a999480f444d1b96f09b0640f52b1537e (patch)
tree19b237526c2fb9ad82f5e8349ea765273d9b44f3 /fs/xfs/xfs_ialloc.c
parent57ce36feb4d1281247755bc445bae77728298955 (diff)
parent1bd960ee2b1231759bd485aad0fa483c2f793a3b (diff)
downloadlinux-3.10-3cf9460a999480f444d1b96f09b0640f52b1537e.tar.gz
linux-3.10-3cf9460a999480f444d1b96f09b0640f52b1537e.tar.bz2
linux-3.10-3cf9460a999480f444d1b96f09b0640f52b1537e.zip
Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6
* 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6: [XFS] If you mount an XFS filesystem with no mount options at all, then
Diffstat (limited to 'fs/xfs/xfs_ialloc.c')
-rw-r--r--fs/xfs/xfs_ialloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_ialloc.c b/fs/xfs/xfs_ialloc.c
index c5836b951d0..db9d5fa600a 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;