Merge tag 'usb-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[linux.git] / fs / minix / namei.c

diff --git a/fs/minix/namei.c b/fs/minix/namei.c
index 114084d5636aea1cb29ac1fd47324bd6b4184df8..d6031acc34f0c50a5e09af237cbbfa387ae49853 100644 (file)
--- a/fs/minix/namei.c
+++ b/fs/minix/namei.c
@@ -149,8 +149,7 @@ static int minix_unlink(struct inode * dir, struct dentry *dentry)
        if (!de)
                return -ENOENT;
        err = minix_delete_entry(de, page);
-       kunmap(page);
-       put_page(page);
+       unmap_and_put_page(page, de);
 
        if (err)
                return err;
@@ -242,13 +241,10 @@ static int minix_rename(struct mnt_idmap *idmap,
                        inode_dec_link_count(old_dir);
        }
 out_dir:
-       if (dir_de) {
-               kunmap(dir_page);
-               put_page(dir_page);
-       }
+       if (dir_de)
+               unmap_and_put_page(dir_page, dir_de);
 out_old:
-       kunmap(old_page);
-       put_page(old_page);
+       unmap_and_put_page(old_page, old_de);
 out:
        return err;
 }