mirror of
https://github.com/tbsdtv/linux_media.git
synced 2025-07-23 12:43:29 +02:00
fs/sysv: Use dir_put_page() in sysv_rename()
Use the dir_put_page() helper in sysv_rename() instead of open-coding two kunmap() + put_page(). Cc: Al Viro <viro@zeniv.linux.org.uk> Suggested-by: Ira Weiny <ira.weiny@intel.com> Signed-off-by: Fabio M. De Francesco <fmdefrancesco@gmail.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
committed by
Al Viro
parent
8dd6c7b294
commit
c26ddc49c9
@@ -28,7 +28,7 @@ const struct file_operations sysv_dir_operations = {
|
|||||||
.fsync = generic_file_fsync,
|
.fsync = generic_file_fsync,
|
||||||
};
|
};
|
||||||
|
|
||||||
static inline void dir_put_page(struct page *page)
|
inline void dir_put_page(struct page *page)
|
||||||
{
|
{
|
||||||
kunmap(page);
|
kunmap(page);
|
||||||
put_page(page);
|
put_page(page);
|
||||||
|
@@ -250,13 +250,10 @@ static int sysv_rename(struct user_namespace *mnt_userns, struct inode *old_dir,
|
|||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
out_dir:
|
out_dir:
|
||||||
if (dir_de) {
|
if (dir_de)
|
||||||
kunmap(dir_page);
|
dir_put_page(dir_page);
|
||||||
put_page(dir_page);
|
|
||||||
}
|
|
||||||
out_old:
|
out_old:
|
||||||
kunmap(old_page);
|
dir_put_page(old_page);
|
||||||
put_page(old_page);
|
|
||||||
out:
|
out:
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
@@ -148,6 +148,7 @@ extern void sysv_destroy_icache(void);
|
|||||||
|
|
||||||
|
|
||||||
/* dir.c */
|
/* dir.c */
|
||||||
|
extern void dir_put_page(struct page *page);
|
||||||
extern struct sysv_dir_entry *sysv_find_entry(struct dentry *, struct page **);
|
extern struct sysv_dir_entry *sysv_find_entry(struct dentry *, struct page **);
|
||||||
extern int sysv_add_link(struct dentry *, struct inode *);
|
extern int sysv_add_link(struct dentry *, struct inode *);
|
||||||
extern int sysv_delete_entry(struct sysv_dir_entry *, struct page *);
|
extern int sysv_delete_entry(struct sysv_dir_entry *, struct page *);
|
||||||
|
Reference in New Issue
Block a user