diff options
Diffstat (limited to 'fs/aufs/xino.c')
| -rw-r--r-- | fs/aufs/xino.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/aufs/xino.c b/fs/aufs/xino.c index c0eb51f3c..4d1d5d439 100644 --- a/fs/aufs/xino.c +++ b/fs/aufs/xino.c @@ -232,7 +232,7 @@ static void au_xino_lock_dir(struct super_block *sb, struct file *xino, bindex = au_br_index(sb, brid); if (bindex >= 0) { ldir->hdir = au_hi(d_inode(sb->s_root), bindex); - au_hn_imtx_lock_nested(ldir->hdir, AuLsc_I_PARENT); + au_hn_inode_lock_nested(ldir->hdir, AuLsc_I_PARENT); } else { ldir->parent = dget_parent(xino->f_path.dentry); ldir->dir = d_inode(ldir->parent); @@ -243,7 +243,7 @@ static void au_xino_lock_dir(struct super_block *sb, struct file *xino, static void au_xino_unlock_dir(struct au_xino_lock_dir *ldir) { if (ldir->hdir) - au_hn_imtx_unlock(ldir->hdir); + au_hn_inode_unlock(ldir->hdir); else { inode_unlock(ldir->dir); dput(ldir->parent); @@ -585,7 +585,7 @@ void au_xino_delete_inode(struct inode *inode, const int unlinked) struct au_branch *br; vfs_writef_t xwrite; - AuDebugOn(is_bad_inode(inode)); + AuDebugOn(au_is_bad_inode(inode)); sb = inode->i_sb; mnt_flags = au_mntflags(sb); @@ -1113,7 +1113,6 @@ static int au_xino_set_br(struct super_block *sb, struct file *base) ino = AUFS_ROOT_INO; writef = au_sbi(sb)->si_xwrite; for (bindex = 0, p = fpair; bindex <= bbot; bindex++, p++) { - br = au_sbr(sb, bindex); bshared = is_sb_shared(sb, bindex, bindex - 1); if (bshared >= 0) { /* shared xino */ @@ -1123,6 +1122,7 @@ static int au_xino_set_br(struct super_block *sb, struct file *base) if (!p->new) { /* new xino */ + br = au_sbr(sb, bindex); p->old = br->br_xino.xi_file; p->new = au_xino_create2(base, br->br_xino.xi_file); err = PTR_ERR(p->new); |