Commit 2b0a80b0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
  ...
parents 92825b02 d11ae8e0

Documentation/filesystems/ceph.txt

+8 −6
Original line number Diff line number Diff line
@@ -22,9 +22,7 @@ In contrast to cluster filesystems like GFS, OCFS2, and GPFS that rely 
on symmetric access by all clients to shared block devices, Ceph

separates data and metadata management into independent server

clusters, similar to Lustre.  Unlike Lustre, however, metadata and

storage nodes run entirely as user space daemons.  Storage nodes

utilize btrfs to store data objects, leveraging its advanced features

(checksumming, metadata replication, etc.).  File data is striped

storage nodes run entirely as user space daemons.  File data is striped

across storage nodes in large chunks to distribute workload and

facilitate high throughputs.  When storage nodes fail, data is

re-replicated in a distributed fashion by the storage nodes themselves
@@ -118,6 +116,10 @@ Mount Options 
	of a non-responsive Ceph file system.  The default is 30

	seconds.



  caps_max=X

	Specify the maximum number of caps to hold. Unused caps are released

	when number of caps exceeds the limit. The default is 0 (no limit)



  rbytes

	When stat() is called on a directory, set st_size to 'rbytes',

	the summation of file sizes over all files nested beneath that
@@ -160,11 +162,11 @@ More Information 
================



For more information on Ceph, see the home page at

	http://ceph.newdream.net/

	https://ceph.com/



The Linux kernel client source tree is available at

	git://ceph.newdream.net/git/ceph-client.git

	https://github.com/ceph/ceph-client.git

	git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git



and the source for the full system is at

	git://ceph.newdream.net/git/ceph.git
 
	https://github.com/ceph/ceph.git

drivers/block/rbd.c

+297 −103

File changed.

Preview size limit exceeded, changes collapsed.

fs/ceph/caps.c

+48 −24

File changed.

Preview size limit exceeded, changes collapsed.

fs/ceph/debugfs.c

+0 −27
Original line number Diff line number Diff line
@@ -139,23 +139,6 @@ static int caps_show(struct seq_file *s, void *p) 
	return 0;

}



static int dentry_lru_show(struct seq_file *s, void *ptr)

{

	struct ceph_fs_client *fsc = s->private;

	struct ceph_mds_client *mdsc = fsc->mdsc;

	struct ceph_dentry_info *di;



	spin_lock(&mdsc->dentry_lru_lock);

	list_for_each_entry(di, &mdsc->dentry_lru, lru) {

		struct dentry *dentry = di->dentry;

		seq_printf(s, "%p %p\t%pd\n",

			   di, dentry, dentry);

	}

	spin_unlock(&mdsc->dentry_lru_lock);



	return 0;

}



static int mds_sessions_show(struct seq_file *s, void *ptr)

{

	struct ceph_fs_client *fsc = s->private;
@@ -195,7 +178,6 @@ static int mds_sessions_show(struct seq_file *s, void *ptr) 
CEPH_DEFINE_SHOW_FUNC(mdsmap_show)

CEPH_DEFINE_SHOW_FUNC(mdsc_show)

CEPH_DEFINE_SHOW_FUNC(caps_show)

CEPH_DEFINE_SHOW_FUNC(dentry_lru_show)

CEPH_DEFINE_SHOW_FUNC(mds_sessions_show)
@@ -231,7 +213,6 @@ void ceph_fs_debugfs_cleanup(struct ceph_fs_client *fsc) 
	debugfs_remove(fsc->debugfs_mds_sessions);

	debugfs_remove(fsc->debugfs_caps);

	debugfs_remove(fsc->debugfs_mdsc);

	debugfs_remove(fsc->debugfs_dentry_lru);

}



int ceph_fs_debugfs_init(struct ceph_fs_client *fsc)
@@ -291,14 +272,6 @@ int ceph_fs_debugfs_init(struct ceph_fs_client *fsc) 
	if (!fsc->debugfs_caps)

		goto out;



	fsc->debugfs_dentry_lru = debugfs_create_file("dentry_lru",

					0400,

					fsc->client->debugfs_dir,

					fsc,

					&dentry_lru_show_fops);

	if (!fsc->debugfs_dentry_lru)

		goto out;



	return 0;



out:

fs/ceph/dir.c

+376 −79

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE