Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c19bf74f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ceph-for-4.20-rc7' of https://github.com/ceph/ceph-client 

Pull ceph fix from Ilya Dryomov:
 "Luis discovered a problem with the new copyfrom offload on the server
  side. Disable it for now"

* tag 'ceph-for-4.20-rc7' of https://github.com/ceph/ceph-client:
  ceph: make 'nocopyfrom' a default mount option
parents 7fb5f5d3 6f9718fe

fs/ceph/super.c

+2 −2
Original line number Diff line number Diff line
@@ -563,8 +563,8 @@ static int ceph_show_options(struct seq_file *m, struct dentry *root) 
		seq_puts(m, ",noacl");

#endif



	if (fsopt->flags & CEPH_MOUNT_OPT_NOCOPYFROM)

		seq_puts(m, ",nocopyfrom");

	if ((fsopt->flags & CEPH_MOUNT_OPT_NOCOPYFROM) == 0)

		seq_puts(m, ",copyfrom");



	if (fsopt->mds_namespace)

		seq_show_option(m, "mds_namespace", fsopt->mds_namespace);

fs/ceph/super.h

+3 −1
Original line number Diff line number Diff line
@@ -42,7 +42,9 @@ 
#define CEPH_MOUNT_OPT_NOQUOTADF       (1<<13) /* no root dir quota in statfs */

#define CEPH_MOUNT_OPT_NOCOPYFROM      (1<<14) /* don't use RADOS 'copy-from' op */



#define CEPH_MOUNT_OPT_DEFAULT    CEPH_MOUNT_OPT_DCACHE

#define CEPH_MOUNT_OPT_DEFAULT			\

	(CEPH_MOUNT_OPT_DCACHE |		\

	 CEPH_MOUNT_OPT_NOCOPYFROM)



#define ceph_set_mount_opt(fsc, opt) \

	(fsc)->mount_options->flags |= CEPH_MOUNT_OPT_##opt;