diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-06-10 05:30:17 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-06-10 05:30:17 -0300 |
| commit | d635711daa98be86d4c7fd01499c34f566b54ccb (patch) | |
| tree | aa5cc3760a27c3d57146498cb82fa549547de06c /fs/aufs/whout.c | |
| parent | c91265cd0efb83778f015b4d4b1129bd2cfd075e (diff) | |
Linux-libre 4.6.2-gnu
Diffstat (limited to 'fs/aufs/whout.c')
| -rw-r--r-- | fs/aufs/whout.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/aufs/whout.c b/fs/aufs/whout.c index fdda85eef..78f97ed60 100644 --- a/fs/aufs/whout.c +++ b/fs/aufs/whout.c @@ -585,7 +585,7 @@ static void reinit_br_wh(void *arg) out: if (wbr) atomic_dec(&wbr->wbr_wh_running); - atomic_dec(&a->br->br_count); + au_br_put(a->br); si_write_unlock(a->sb); au_nwt_done(&au_sbi(a->sb)->si_nowait); kfree(arg); @@ -611,11 +611,11 @@ static void kick_reinit_br_wh(struct super_block *sb, struct au_branch *br) */ arg->sb = sb; arg->br = br; - atomic_inc(&br->br_count); + au_br_get(br); wkq_err = au_wkq_nowait(reinit_br_wh, arg, sb, /*flags*/0); if (unlikely(wkq_err)) { atomic_dec(&br->br_wbr->wbr_wh_running); - atomic_dec(&br->br_count); + au_br_put(br); kfree(arg); } do_dec = 0; @@ -904,7 +904,7 @@ out: void au_whtmp_rmdir_free(struct au_whtmp_rmdir *whtmp) { if (whtmp->br) - atomic_dec(&whtmp->br->br_count); + au_br_put(whtmp->br); dput(whtmp->wh_dentry); iput(whtmp->dir); au_nhash_wh_free(&whtmp->whlist); @@ -963,7 +963,7 @@ int au_whtmp_rmdir(struct inode *dir, aufs_bindex_t bindex, } if (!err) { - if (au_ibstart(dir) == bindex) { + if (au_ibtop(dir) == bindex) { /* todo: dir->i_mutex is necessary */ au_cpup_attr_timesizes(dir); if (h_nlink) @@ -1037,7 +1037,7 @@ void au_whtmp_kick_rmdir(struct inode *dir, aufs_bindex_t bindex, sb = dir->i_sb; args->dir = au_igrab(dir); args->br = au_sbr(sb, bindex); - atomic_inc(&args->br->br_count); + au_br_get(args->br); args->wh_dentry = dget(wh_dentry); wkq_err = au_wkq_nowait(call_rmdir_whtmp, args, sb, /*flags*/0); if (unlikely(wkq_err)) { |