minixfs: Use dir_put_page() in minix_unlink() and minix_rename()

... rather than open-coding it there.  Counterpart of the
corresponding fs/sysv commit from Fabio's series...

Reviewed-by: Fabio M. De Francesco <fabio.maria.de.francesco@linux.intel.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/minix/dir.c b/fs/minix/dir.c
index 4e5483adea401a57cc6872e45c267a5be7cdd3e7..ccb6c47fd7fe3ef31bf4c1ee6676a0c098fcfa0b 100644 (file)
--- a/fs/minix/dir.c
+++ b/fs/minix/dir.c
@@ -26,12 +26,6 @@ const struct file_operations minix_dir_operations = {
        .fsync          = generic_file_fsync,
 };
 
-static inline void dir_put_page(struct page *page)
-{
-       kunmap(page);
-       put_page(page);
-}
-
 /*
  * Return the offset into page `page_nr' of the last valid
  * byte in that page, plus one.

diff --git a/fs/minix/minix.h b/fs/minix/minix.h
index d493507c064f6709d5df1c6af174b2d9e9591d36..cb42b6cf7909361b4e2683f504f0920eff83906c 100644 (file)
--- a/fs/minix/minix.h
+++ b/fs/minix/minix.h
@@ -64,6 +64,11 @@ extern int V2_minix_get_block(struct inode *, long, struct buffer_head *, int);
 extern unsigned V1_minix_blocks(loff_t, struct super_block *);
 extern unsigned V2_minix_blocks(loff_t, struct super_block *);
 
+static inline void dir_put_page(struct page *page)
+{
+       kunmap(page);
+       put_page(page);
+}
 extern struct minix_dir_entry *minix_find_entry(struct dentry*, struct page**);
 extern int minix_add_link(struct dentry*, struct inode*);
 extern int minix_delete_entry(struct minix_dir_entry*, struct page*);

diff --git a/fs/minix/namei.c b/fs/minix/namei.c
index 114084d5636aea1cb29ac1fd47324bd6b4184df8..20923a15e30a9f9d8028b27bf02bb5736e912b3c 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);
+       dir_put_page(page);
 
        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)
+               dir_put_page(dir_page);
 out_old:
-       kunmap(old_page);
-       put_page(old_page);
+       dir_put_page(old_page);
 out:
        return err;
 }