Merge branches 'work.namei', 'work.dcache' and 'work.iov_iter' into for-linus

[linux.git] / fs / ceph / file.c

diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index 9d1554c7d036691d51157f01409d0c42f9fbf0df..159fc8f1a6a00dbc5b291ed6e17d583dd90a269e 100644 (file)
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -1268,7 +1268,8 @@ static ssize_t ceph_read_iter(struct kiocb *iocb, struct iov_iter *to)
                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;
@@ -1765,7 +1766,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,