1 files changed, 9 insertions, 7 deletions

diff --git a/fs/exofs/inode.c b/fs/exofs/inode.c
index b56181047751..d1f80abd8828 100644
--- a/fs/exofs/inode.c
+++ b/fs/exofs/inode.c
@@ -361,12 +361,12 @@ static int read_exec(struct page_collect *pcol)
         return 0;
 
 err:
-        if (!pcol->read_4_write)
-                _unlock_pcol_pages(pcol, ret, READ);
-
-        pcol_free(pcol);
-
+        if (!pcol_copy) /* Failed before ownership transfer */
+                pcol_copy = pcol;
+        _unlock_pcol_pages(pcol_copy, ret, READ);
+        pcol_free(pcol_copy);
         kfree(pcol_copy);
+
         return ret;
 }
 
@@ -676,8 +676,10 @@ static int write_exec(struct page_collect *pcol)
         return 0;
 
 err:
-        _unlock_pcol_pages(pcol, ret, WRITE);
-        pcol_free(pcol);
+        if (!pcol_copy) /* Failed before ownership transfer */
+                pcol_copy = pcol;
+        _unlock_pcol_pages(pcol_copy, ret, WRITE);
+        pcol_free(pcol_copy);
         kfree(pcol_copy);
 
         return ret;