mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
Make ->drop_inode() just return whether inode needs to be dropped
... and let iput_final() do the actual eviction or retention Signed-off-by: Al Viro <[email protected]>
This commit is contained in:
parent
30140837f2
commit
45321ac543
10 changed files with 60 additions and 103 deletions
|
|
@ -1194,9 +1194,10 @@ void ocfs2_evict_inode(struct inode *inode)
|
|||
/* Called under inode_lock, with no more references on the
|
||||
* struct inode, so it's safe here to check the flags field
|
||||
* and to manipulate i_nlink without any other locks. */
|
||||
void ocfs2_drop_inode(struct inode *inode)
|
||||
int ocfs2_drop_inode(struct inode *inode)
|
||||
{
|
||||
struct ocfs2_inode_info *oi = OCFS2_I(inode);
|
||||
int res;
|
||||
|
||||
mlog_entry_void();
|
||||
|
||||
|
|
@ -1204,11 +1205,12 @@ void ocfs2_drop_inode(struct inode *inode)
|
|||
(unsigned long long)oi->ip_blkno, inode->i_nlink, oi->ip_flags);
|
||||
|
||||
if (oi->ip_flags & OCFS2_INODE_MAYBE_ORPHANED)
|
||||
generic_delete_inode(inode);
|
||||
res = 1;
|
||||
else
|
||||
generic_drop_inode(inode);
|
||||
res = generic_drop_inode(inode);
|
||||
|
||||
mlog_exit_void();
|
||||
return res;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -124,7 +124,7 @@ static inline struct ocfs2_caching_info *INODE_CACHE(struct inode *inode)
|
|||
}
|
||||
|
||||
void ocfs2_evict_inode(struct inode *inode);
|
||||
void ocfs2_drop_inode(struct inode *inode);
|
||||
int ocfs2_drop_inode(struct inode *inode);
|
||||
|
||||
/* Flags for ocfs2_iget() */
|
||||
#define OCFS2_FI_FLAG_SYSFILE 0x1
|
||||
|
|
|
|||
Loading…
Reference in a new issue