Skip to content

Commit 2b0a80b

Browse files
torvaldstorvalds
committed
Merge tag 'ceph-for-5.1-rc1' of git://github.com/ceph/ceph-client
Pull ceph updates from Ilya Dryomov: "The highlights are: - rbd will now ignore discards that aren't aligned and big enough to actually free up some space (myself). This is controlled by the new alloc_size map option and can be disabled if needed. - support for rbd deep-flatten feature (myself). Deep-flatten allows "rbd flatten" to fully disconnect the clone image and its snapshots from the parent and make the parent snapshot removable. - a new round of cap handling improvements (Zheng Yan). The kernel client should now be much more prompt about releasing its caps and it is possible to put a limit on the number of caps held. - support for getting ceph.dir.pin extended attribute (Zheng Yan)" * tag 'ceph-for-5.1-rc1' of git://github.com/ceph/ceph-client: (26 commits) Documentation: modern versions of ceph are not backed by btrfs rbd: advertise support for RBD_FEATURE_DEEP_FLATTEN rbd: whole-object write and zeroout should copyup when snapshots exist rbd: copyup with an empty snapshot context (aka deep-copyup) rbd: introduce rbd_obj_issue_copyup_ops() rbd: stop copying num_osd_ops in rbd_obj_issue_copyup() rbd: factor out __rbd_osd_req_create() rbd: clear ->xferred on error from rbd_obj_issue_copyup() rbd: remove experimental designation from kernel layering ceph: add mount option to limit caps count ceph: periodically trim stale dentries ceph: delete stale dentry when last reference is dropped ceph: remove dentry_lru file from debugfs ceph: touch existing cap when handling reply ceph: pass inclusive lend parameter to filemap_write_and_wait_range() rbd: round off and ignore discards that are too small rbd: handle DISCARD and WRITE_ZEROES separately rbd: get rid of obj_req->obj_request_count libceph: use struct_size() for kmalloc() in crush_decode() ceph: send cap releases more aggressively ...
2 parents 92825b0 + d11ae8e commit 2b0a80b

File tree

15 files changed

+1597
-426
lines changed

15 files changed

+1597
-426
lines changed

‎Documentation/filesystems/ceph.txt

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ In contrast to cluster filesystems like GFS, OCFS2, and GPFS that rely
2222
on symmetric access by all clients to shared block devices, Ceph
2323
separates data and metadata management into independent server
2424
clusters, similar to Lustre. Unlike Lustre, however, metadata and
25-
storage nodes run entirely as user space daemons. Storage nodes
26-
utilize btrfs to store data objects, leveraging its advanced features
27-
(checksumming, metadata replication, etc.). File data is striped
25+
storage nodes run entirely as user space daemons. File data is striped
2826
across storage nodes in large chunks to distribute workload and
2927
facilitate high throughputs. When storage nodes fail, data is
3028
re-replicated in a distributed fashion by the storage nodes themselves
@@ -118,6 +116,10 @@ Mount Options
118116
of a non-responsive Ceph file system. The default is 30
119117
seconds.
120118

119+
caps_max=X
120+
Specify the maximum number of caps to hold. Unused caps are released
121+
when number of caps exceeds the limit. The default is 0 (no limit)
122+
121123
rbytes
122124
When stat() is called on a directory, set st_size to 'rbytes',
123125
the summation of file sizes over all files nested beneath that
@@ -160,11 +162,11 @@ More Information
160162
================
161163

162164
For more information on Ceph, see the home page at
163-
http://ceph.newdream.net/
165+
https://ceph.com/
164166

165167
The Linux kernel client source tree is available at
166-
git://ceph.newdream.net/git/ceph-client.git
168+
https://github.com/ceph/ceph-client.git
167169
git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git
168170

169171
and the source for the full system is at
170-
git://ceph.newdream.net/git/ceph.git
172+
https://github.com/ceph/ceph.git

0 commit comments

Comments
 (0)