git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xfs: simplify inode teardown
[safe/jmp/linux-2.6]
/
fs
/
xfs
/
linux-2.6
/
xfs_sync.c
diff --git
a/fs/xfs/linux-2.6/xfs_sync.c
b/fs/xfs/linux-2.6/xfs_sync.c
index
961df0a
..
d895a3a
100644
(file)
--- a/
fs/xfs/linux-2.6/xfs_sync.c
+++ b/
fs/xfs/linux-2.6/xfs_sync.c
@@
-663,10
+663,9
@@
xfs_syncd_stop(
kthread_stop(mp->m_sync_task);
}
kthread_stop(mp->m_sync_task);
}
-int
+
STATIC
int
xfs_reclaim_inode(
xfs_inode_t *ip,
xfs_reclaim_inode(
xfs_inode_t *ip,
- int locked,
int sync_mode)
{
xfs_perag_t *pag = xfs_get_perag(ip->i_mount, ip->i_ino);
int sync_mode)
{
xfs_perag_t *pag = xfs_get_perag(ip->i_mount, ip->i_ino);
@@
-682,10
+681,6
@@
xfs_reclaim_inode(
!__xfs_iflags_test(ip, XFS_IRECLAIMABLE)) {
spin_unlock(&ip->i_flags_lock);
write_unlock(&pag->pag_ici_lock);
!__xfs_iflags_test(ip, XFS_IRECLAIMABLE)) {
spin_unlock(&ip->i_flags_lock);
write_unlock(&pag->pag_ici_lock);
- if (locked) {
- xfs_ifunlock(ip);
- xfs_iunlock(ip, XFS_ILOCK_EXCL);
- }
return -EAGAIN;
}
__xfs_iflags_set(ip, XFS_IRECLAIM);
return -EAGAIN;
}
__xfs_iflags_set(ip, XFS_IRECLAIM);
@@
-704,10
+699,8
@@
xfs_reclaim_inode(
* We get the flush lock regardless, though, just to make sure
* we don't free it while it is being flushed.
*/
* We get the flush lock regardless, though, just to make sure
* we don't free it while it is being flushed.
*/
- if (!locked) {
- xfs_ilock(ip, XFS_ILOCK_EXCL);
- xfs_iflock(ip);
- }
+ xfs_ilock(ip, XFS_ILOCK_EXCL);
+ xfs_iflock(ip);
/*
* In the case of a forced shutdown we rely on xfs_iflush() to
/*
* In the case of a forced shutdown we rely on xfs_iflush() to
@@
-778,7
+771,7
@@
xfs_reclaim_inode_now(
}
read_unlock(&pag->pag_ici_lock);
}
read_unlock(&pag->pag_ici_lock);
- return xfs_reclaim_inode(ip,
0,
flags);
+ return xfs_reclaim_inode(ip, flags);
}
int
}
int