Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+5
-3
+2
-2
fs/ceph/super.c
+2
-2
fs/ceph/super.c
···
563
563
seq_puts(m, ",noacl");
564
564
#endif
565
565
566
-
if (fsopt->flags & CEPH_MOUNT_OPT_NOCOPYFROM)
567
-
seq_puts(m, ",nocopyfrom");
566
+
if ((fsopt->flags & CEPH_MOUNT_OPT_NOCOPYFROM) == 0)
567
+
seq_puts(m, ",copyfrom");
568
568
569
569
if (fsopt->mds_namespace)
570
570
seq_show_option(m, "mds_namespace", fsopt->mds_namespace);
+3
-1
fs/ceph/super.h
+3
-1
fs/ceph/super.h
···
42
42
#define CEPH_MOUNT_OPT_NOQUOTADF (1<<13) /* no root dir quota in statfs */
43
43
#define CEPH_MOUNT_OPT_NOCOPYFROM (1<<14) /* don't use RADOS 'copy-from' op */
44
44
45
-
#define CEPH_MOUNT_OPT_DEFAULT CEPH_MOUNT_OPT_DCACHE
45
+
#define CEPH_MOUNT_OPT_DEFAULT \
46
+
(CEPH_MOUNT_OPT_DCACHE | \
47
+
CEPH_MOUNT_OPT_NOCOPYFROM)
46
48
47
49
#define ceph_set_mount_opt(fsc, opt) \
48
50
(fsc)->mount_options->flags |= CEPH_MOUNT_OPT_##opt;