Skip to content

Commit 6628f69

Browse files
author
Al Viro
committed
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>
1 parent ee0d27c commit 6628f69

3 files changed

Lines changed: 9 additions & 14 deletions

File tree

fs/minix/dir.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@ const struct file_operations minix_dir_operations = {
2626
.fsync = generic_file_fsync,
2727
};
2828

29-
static inline void dir_put_page(struct page *page)
30-
{
31-
kunmap(page);
32-
put_page(page);
33-
}
34-
3529
/*
3630
* Return the offset into page `page_nr' of the last valid
3731
* byte in that page, plus one.

fs/minix/minix.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,11 @@ extern int V2_minix_get_block(struct inode *, long, struct buffer_head *, int);
6464
extern unsigned V1_minix_blocks(loff_t, struct super_block *);
6565
extern unsigned V2_minix_blocks(loff_t, struct super_block *);
6666

67+
static inline void dir_put_page(struct page *page)
68+
{
69+
kunmap(page);
70+
put_page(page);
71+
}
6772
extern struct minix_dir_entry *minix_find_entry(struct dentry*, struct page**);
6873
extern int minix_add_link(struct dentry*, struct inode*);
6974
extern int minix_delete_entry(struct minix_dir_entry*, struct page*);

fs/minix/namei.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,7 @@ static int minix_unlink(struct inode * dir, struct dentry *dentry)
149149
if (!de)
150150
return -ENOENT;
151151
err = minix_delete_entry(de, page);
152-
kunmap(page);
153-
put_page(page);
152+
dir_put_page(page);
154153

155154
if (err)
156155
return err;
@@ -242,13 +241,10 @@ static int minix_rename(struct mnt_idmap *idmap,
242241
inode_dec_link_count(old_dir);
243242
}
244243
out_dir:
245-
if (dir_de) {
246-
kunmap(dir_page);
247-
put_page(dir_page);
248-
}
244+
if (dir_de)
245+
dir_put_page(dir_page);
249246
out_old:
250-
kunmap(old_page);
251-
put_page(old_page);
247+
dir_put_page(old_page);
252248
out:
253249
return err;
254250
}

0 commit comments

Comments
 (0)