diff options
author | Dave Airlie <airlied@redhat.com> | 2016-04-22 08:32:51 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2016-04-22 08:32:51 +1000 |
commit | 49047962ecf02d76bdaa378c00a51c9b829ac195 (patch) | |
tree | 4e711bead6598486b033c4d2dbdb7f7c0dd6f23a /fs/minix/namei.c | |
parent | d57d47735ef5461952ef1dbdd515ebc0ffc5d2cc (diff) | |
parent | bf16200689118d19de1b8d2a3c314fc21f5dc7bb (diff) | |
download | blackbird-op-linux-49047962ecf02d76bdaa378c00a51c9b829ac195.tar.gz blackbird-op-linux-49047962ecf02d76bdaa378c00a51c9b829ac195.zip |
Merge tag 'v4.6-rc3' into drm-next
Backmerge 4.6-rc3 for i915.
Linux 4.6-rc3
Diffstat (limited to 'fs/minix/namei.c')
-rw-r--r-- | fs/minix/namei.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/minix/namei.c b/fs/minix/namei.c index a795a11e50c7..2887d1d95ce2 100644 --- a/fs/minix/namei.c +++ b/fs/minix/namei.c @@ -243,11 +243,11 @@ static int minix_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; } |