From 863981e96738983919de841ec669e157e6bdaeb0 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 11 Sep 2016 04:34:46 -0300 Subject: Linux-libre 4.7.1-gnu --- fs/aufs/whout.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'fs/aufs/whout.c') diff --git a/fs/aufs/whout.c b/fs/aufs/whout.c index 16a96f88f..54feb0837 100644 --- a/fs/aufs/whout.c +++ b/fs/aufs/whout.c @@ -149,7 +149,7 @@ struct dentry *au_whtmp_lkup(struct dentry *h_parent, struct au_branch *br, out_name: if (name != defname) - kfree(name); + au_delayed_kfree(name); out: AuTraceErrPtr(dentry); return dentry; @@ -588,7 +588,7 @@ out: au_br_put(a->br); si_write_unlock(a->sb); au_nwt_done(&au_sbi(a->sb)->si_nowait); - kfree(arg); + au_delayed_kfree(arg); if (unlikely(err)) AuIOErr("err %d\n", err); } @@ -616,7 +616,7 @@ static void kick_reinit_br_wh(struct super_block *sb, struct au_branch *br) if (unlikely(wkq_err)) { atomic_dec(&br->br_wbr->wbr_wh_running); au_br_put(br); - kfree(arg); + au_delayed_kfree(arg); } do_dec = 0; } @@ -775,7 +775,7 @@ struct dentry *au_wh_lkup(struct dentry *h_parent, struct qstr *base_name, wh_dentry = ERR_PTR(err); if (!err) { wh_dentry = vfsub_lkup_one(&wh_name, h_parent); - kfree(wh_name.name); + au_delayed_kfree(wh_name.name); } return wh_dentry; } @@ -851,7 +851,7 @@ static int del_wh_children(struct dentry *h_dentry, struct au_nhash *whlist, break; } } - free_page((unsigned long)wh_name.name); + au_delayed_free_page((unsigned long)wh_name.name); out: return err; @@ -893,7 +893,7 @@ struct au_whtmp_rmdir *au_whtmp_rmdir_alloc(struct super_block *sb, gfp_t gfp) rdhash = AUFS_RDHASH_DEF; err = au_nhash_alloc(&whtmp->whlist, rdhash, gfp); if (unlikely(err)) { - kfree(whtmp); + au_delayed_kfree(whtmp); whtmp = ERR_PTR(err); } @@ -908,7 +908,7 @@ void au_whtmp_rmdir_free(struct au_whtmp_rmdir *whtmp) dput(whtmp->wh_dentry); iput(whtmp->dir); au_nhash_wh_free(&whtmp->whlist); - kfree(whtmp); + au_delayed_kfree(whtmp); } /* -- cgit v1.2.3-54-g00ecf