1 files changed, 6 insertions, 2 deletions

diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
index c20360002f29..f959a1532767 100644
--- a/fs/ocfs2/aops.c
+++ b/fs/ocfs2/aops.c
@@ -1898,10 +1898,14 @@ out_commit:
 out:
         ocfs2_free_write_ctxt(wc);
 
-        if (data_ac)
+        if (data_ac) {
                 ocfs2_free_alloc_context(data_ac);
-        if (meta_ac)
+                data_ac = NULL;
+        }
+        if (meta_ac) {
                 ocfs2_free_alloc_context(meta_ac);
+                meta_ac = NULL;
+        }
 
         if (ret == -ENOSPC && try_free) {
                 /*