tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'ceph-for-4.9-rc5' of git://github.com/ceph/ceph-client

Pull Ceph fixes from Ilya Dryomov:
"Ceph's ->read_iter() implementation is incompatible with the new
generic_file_splice_read() code that went into -rc1. Switch to the
less efficient default_file_splice_read() for now; the proper fix is
being held for 4.10.

We also have a fix for a 4.8 regression and a trival libceph fixup"

* tag 'ceph-for-4.9-rc5' of git://github.com/ceph/ceph-client:
libceph: initialize last_linger_id with a large integer
libceph: fix legacy layout decode with pool 0
ceph: use default file splice read callback

Linus Torvalds ef091b3c ef5beed9

+5 -2
-1
fs/ceph/file.c
··· 1770 1770 .fsync = ceph_fsync, 1771 1771 .lock = ceph_lock, 1772 1772 .flock = ceph_flock, 1773 - .splice_read = generic_file_splice_read, 1774 1773 .splice_write = iter_file_splice_write, 1775 1774 .unlocked_ioctl = ceph_ioctl, 1776 1775 .compat_ioctl = ceph_ioctl,
+2
include/linux/ceph/osd_client.h
··· 258 258 struct ceph_entity_addr addr; 259 259 }; 260 260 261 + #define CEPH_LINGER_ID_START 0xffff000000000000ULL 262 + 261 263 struct ceph_osd_client { 262 264 struct ceph_client *client; 263 265
+2 -1
net/ceph/ceph_fs.c
··· 34 34 fl->stripe_count = le32_to_cpu(legacy->fl_stripe_count); 35 35 fl->object_size = le32_to_cpu(legacy->fl_object_size); 36 36 fl->pool_id = le32_to_cpu(legacy->fl_pg_pool); 37 - if (fl->pool_id == 0) 37 + if (fl->pool_id == 0 && fl->stripe_unit == 0 && 38 + fl->stripe_count == 0 && fl->object_size == 0) 38 39 fl->pool_id = -1; 39 40 } 40 41 EXPORT_SYMBOL(ceph_file_layout_from_legacy);
+1
net/ceph/osd_client.c
··· 4094 4094 osd_init(&osdc->homeless_osd); 4095 4095 osdc->homeless_osd.o_osdc = osdc; 4096 4096 osdc->homeless_osd.o_osd = CEPH_HOMELESS_OSD; 4097 + osdc->last_linger_id = CEPH_LINGER_ID_START; 4097 4098 osdc->linger_requests = RB_ROOT; 4098 4099 osdc->map_checks = RB_ROOT; 4099 4100 osdc->linger_map_checks = RB_ROOT;