diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-18 14:08:07 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-18 14:08:07 -0800 |
| commit | 1e868d8e6d2c4b8736cdf7a4bd5701e4f527f722 (patch) | |
| tree | ce9ab0c1e5b4fd1610e8bf49a089a5cd5a474566 /fs/xfs/xfs_iget.c | |
| parent | 2faae42233778676607a2a45b95aeb375bebe2c6 (diff) | |
| parent | e09f98606dcc156de1146c209d45a0d6d5f51c3f (diff) | |
| download | kernel-crypto-1e868d8e6d2c4b8736cdf7a4bd5701e4f527f722.tar.gz kernel-crypto-1e868d8e6d2c4b8736cdf7a4bd5701e4f527f722.tar.xz kernel-crypto-1e868d8e6d2c4b8736cdf7a4bd5701e4f527f722.zip | |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs:
xfs: xfs_swap_extents needs to handle dynamic fork offsets
xfs: fix missing error check in xfs_rtfree_range
xfs: fix stale inode flush avoidance
xfs: Remove inode iolock held check during allocation
xfs: reclaim all inodes by background tree walks
xfs: Avoid inodes in reclaim when flushing from inode cache
xfs: reclaim inodes under a write lock
Diffstat (limited to 'fs/xfs/xfs_iget.c')
| -rw-r--r-- | fs/xfs/xfs_iget.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/xfs/xfs_iget.c b/fs/xfs/xfs_iget.c index fa402a6bbbc..155e798f30a 100644 --- a/fs/xfs/xfs_iget.c +++ b/fs/xfs/xfs_iget.c @@ -73,7 +73,6 @@ xfs_inode_alloc( ASSERT(atomic_read(&ip->i_pincount) == 0); ASSERT(!spin_is_locked(&ip->i_flags_lock)); ASSERT(completion_done(&ip->i_flush)); - ASSERT(!rwsem_is_locked(&ip->i_iolock.mr_lock)); mrlock_init(&ip->i_iolock, MRLOCK_BARRIER, "xfsio", ip->i_ino); |