From b907a8622e39eecfc4b243f3be3ad26559d1faee Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 27 Jun 2016 21:01:09 -0300 Subject: Linux-libre 4.6.3-gnu --- fs/aufs/inode.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'fs/aufs/inode.h') diff --git a/fs/aufs/inode.h b/fs/aufs/inode.h index 0d654e83a..14f788268 100644 --- a/fs/aufs/inode.h +++ b/fs/aufs/inode.h @@ -467,6 +467,11 @@ static inline struct au_hinode *au_hinode(struct au_iinfo *iinfo, return iinfo->ii_hinode + bindex; } +static inline int au_is_bad_inode(struct inode *inode) +{ + return !!(is_bad_inode(inode) || !au_hinode(au_ii(inode), 0)); +} + static inline aufs_bindex_t au_ii_br_id(struct inode *inode, aufs_bindex_t bindex) { @@ -653,20 +658,20 @@ static inline void au_hn_resume(struct au_hinode *hdir) au_hn_ctl(hdir, /*do_set*/1); } -static inline void au_hn_imtx_lock(struct au_hinode *hdir) +static inline void au_hn_inode_lock(struct au_hinode *hdir) { inode_lock(hdir->hi_inode); au_hn_suspend(hdir); } -static inline void au_hn_imtx_lock_nested(struct au_hinode *hdir, +static inline void au_hn_inode_lock_nested(struct au_hinode *hdir, unsigned int sc __maybe_unused) { inode_lock_nested(hdir->hi_inode, sc); au_hn_suspend(hdir); } -static inline void au_hn_imtx_unlock(struct au_hinode *hdir) +static inline void au_hn_inode_unlock(struct au_hinode *hdir) { au_hn_resume(hdir); inode_unlock(hdir->hi_inode); -- cgit v1.2.3-54-g00ecf