diff options
| author | Dave Chinner <david@fromorbit.com> | 2014-12-04 09:46:17 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-12-04 09:46:17 +1100 |
| commit | 6044e4386cd51dece882ea42352cdaaab0f24cad (patch) | |
| tree | cde51132ea9d6afefdf05ad621fc22bbb796d5f4 /fs/xfs/xfs_icache.c | |
| parent | c14fc01340dd0afe58d8671acc3ea5e907e707ae (diff) | |
| parent | b29c70f59870dad0945b0e0b3fe3758ad528e268 (diff) | |
Merge branch 'xfs-misc-fixes-for-3.19-2' into for-nextxfs-for-linus-3.19-rc1
Conflicts:
fs/xfs/xfs_iops.c
Diffstat (limited to 'fs/xfs/xfs_icache.c')
| -rw-r--r-- | fs/xfs/xfs_icache.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c index 92ca910d0ec6..9771b7ef62ed 100644 --- a/fs/xfs/xfs_icache.c +++ b/fs/xfs/xfs_icache.c @@ -63,6 +63,7 @@ xfs_inode_alloc( return NULL; } + XFS_STATS_INC(vn_active); ASSERT(atomic_read(&ip->i_pincount) == 0); ASSERT(!spin_is_locked(&ip->i_flags_lock)); ASSERT(!xfs_isiflocked(ip)); @@ -128,6 +129,7 @@ xfs_inode_free( /* asserts to verify all state is correct here */ ASSERT(atomic_read(&ip->i_pincount) == 0); ASSERT(!xfs_isiflocked(ip)); + XFS_STATS_DEC(vn_active); call_rcu(&VFS_I(ip)->i_rcu, xfs_inode_free_callback); } |