summaryrefslogtreecommitdiffstats
path: root/fs/ufs/namei.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2016-05-10 16:06:04 +0200
committerTakashi Iwai <tiwai@suse.de>2016-05-10 16:06:04 +0200
commit2e00fde5c6ed8535244332ebb55e881baa54ae46 (patch)
treef578e02ef1dc6e59630f09404bb2f58500876811 /fs/ufs/namei.c
parentALSA: hda - Clarify CONFIG_SND_HDA_RECONFIG usages (diff)
parentALSA: hda - Fix subwoofer pin on ASUS N751 and N551 (diff)
downloadlinux-2e00fde5c6ed8535244332ebb55e881baa54ae46.tar.xz
linux-2e00fde5c6ed8535244332ebb55e881baa54ae46.zip
Merge branch 'for-linus' into for-next
Diffstat (limited to 'fs/ufs/namei.c')
-rw-r--r--fs/ufs/namei.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ufs/namei.c b/fs/ufs/namei.c
index acf4a3b61b81..a1559f762805 100644
--- a/fs/ufs/namei.c
+++ b/fs/ufs/namei.c
@@ -305,7 +305,7 @@ static int ufs_rename(struct inode *old_dir, struct dentry *old_dentry,
ufs_set_link(old_inode, dir_de, dir_page, new_dir, 0);
else {
kunmap(dir_page);
- page_cache_release(dir_page);
+ put_page(dir_page);
}
inode_dec_link_count(old_dir);
}
@@ -315,11 +315,11 @@ static int ufs_rename(struct inode *old_dir, struct dentry *old_dentry,
out_dir:
if (dir_de) {
kunmap(dir_page);
- page_cache_release(dir_page);
+ put_page(dir_page);
}
out_old:
kunmap(old_page);
- page_cache_release(old_page);
+ put_page(old_page);
out:
return err;
}