Merge tag 'mm-stable-2023-04-27-15-30' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-block.git] / fs / ext4 / inline.c

diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
index b9fb1177fff684afed507b3236826e4af8acdeb1..859bc4e2c9b0af3a98e0b33dd4a0eac94e0a9585 100644 (file)
--- a/fs/ext4/inline.c
+++ b/fs/ext4/inline.c
@@ -566,9 +566,9 @@ retry:
         * started */
        folio = __filemap_get_folio(mapping, 0, FGP_WRITEBEGIN | FGP_NOFS,
                        mapping_gfp_mask(mapping));
-       if (!folio) {
-               ret = -ENOMEM;
-               goto out;
+       if (IS_ERR(folio)) {
+               ret = PTR_ERR(folio);
+               goto out_nofolio;
        }
 
        ext4_write_lock_xattr(inode, &no_expand);
@@ -633,6 +633,7 @@ out:
                folio_unlock(folio);
                folio_put(folio);
        }
+out_nofolio:
        if (sem_held)
                ext4_write_unlock_xattr(inode, &no_expand);
        if (handle)
@@ -693,8 +694,8 @@ int ext4_try_to_write_inline_data(struct address_space *mapping,
 
        folio = __filemap_get_folio(mapping, 0, FGP_WRITEBEGIN | FGP_NOFS,
                                        mapping_gfp_mask(mapping));
-       if (!folio) {
-               ret = -ENOMEM;
+       if (IS_ERR(folio)) {
+               ret = PTR_ERR(folio);
                goto out;
        }
 
@@ -854,8 +855,8 @@ static int ext4_da_convert_inline_data_to_extent(struct address_space *mapping,
 
        folio = __filemap_get_folio(mapping, 0, FGP_WRITEBEGIN,
                                        mapping_gfp_mask(mapping));
-       if (!folio)
-               return -ENOMEM;
+       if (IS_ERR(folio))
+               return PTR_ERR(folio);
 
        down_read(&EXT4_I(inode)->xattr_sem);
        if (!ext4_has_inline_data(inode)) {
@@ -947,8 +948,8 @@ retry_journal:
         */
        folio = __filemap_get_folio(mapping, 0, FGP_WRITEBEGIN | FGP_NOFS,
                                        mapping_gfp_mask(mapping));
-       if (!folio) {
-               ret = -ENOMEM;
+       if (IS_ERR(folio)) {
+               ret = PTR_ERR(folio);
                goto out_journal;
        }