mm: merge folio_has_private()/filemap_release_folio() call pairs

[linux-2.6-microblaze.git] / fs / ext4 / move_extent.c

diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c
index f4b4861..18a9e7c 100644 (file)
--- a/fs/ext4/move_extent.c
+++ b/fs/ext4/move_extent.c
@@ -340,10 +340,8 @@ again:
                        ext4_double_up_write_data_sem(orig_inode, donor_inode);
                        goto data_copy;
                }
-               if ((folio_has_private(folio[0]) &&
-                    !filemap_release_folio(folio[0], 0)) ||
-                   (folio_has_private(folio[1]) &&
-                    !filemap_release_folio(folio[1], 0))) {
+               if (!filemap_release_folio(folio[0], 0) ||
+                   !filemap_release_folio(folio[1], 0)) {
                        *err = -EBUSY;
                        goto drop_data_sem;
                }
@@ -362,10 +360,8 @@ data_copy:
 
        /* At this point all buffers in range are uptodate, old mapping layout
         * is no longer required, try to drop it now. */
-       if ((folio_has_private(folio[0]) &&
-               !filemap_release_folio(folio[0], 0)) ||
-           (folio_has_private(folio[1]) &&
-               !filemap_release_folio(folio[1], 0))) {
+       if (!filemap_release_folio(folio[0], 0) ||
+           !filemap_release_folio(folio[1], 0)) {
                *err = -EBUSY;
                goto unlock_folios;
        }