diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-11-13 08:16:40 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-11-13 08:16:40 +0100 |
commit | 74239ac259519a98f4c32439326afe7e7eb64459 (patch) | |
tree | a3e9a1ae0dc6634e7aa669c8881e425634094257 /fs/ceph/file.c | |
parent | a75dcb5848359f488c32c0aef8711d9bd37a77b8 (diff) | |
parent | 86e4ee760ef2f7571e233a3abf065ffd0bb4089d (diff) | |
download | linux-74239ac259519a98f4c32439326afe7e7eb64459.tar.gz |
Merge branch 'linus' into efi/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/ceph/file.c')
-rw-r--r-- | fs/ceph/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ceph/file.c b/fs/ceph/file.c index 7bf08825cc11..f995e3528a33 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c @@ -1272,7 +1272,8 @@ again: statret = __ceph_do_getattr(inode, page, CEPH_STAT_CAP_INLINE_DATA, !!page); if (statret < 0) { - __free_page(page); + if (page) + __free_page(page); if (statret == -ENODATA) { BUG_ON(retry_op != READ_INLINE); goto again; @@ -1769,7 +1770,6 @@ const struct file_operations ceph_file_fops = { .fsync = ceph_fsync, .lock = ceph_lock, .flock = ceph_flock, - .splice_read = generic_file_splice_read, .splice_write = iter_file_splice_write, .unlocked_ioctl = ceph_ioctl, .compat_ioctl = ceph_ioctl, |