History

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

Linus Torvalds committed 7 years ago

Commit c19bf742 parents 7fb5f5d 6f9718f2 files · +5 −3Browse files

Unified · Split

2 files
  1. fs/ceph/super.c +2 −2
  2. fs/ceph/super.h +3 −1
fs/ceph/super.c+2−2
@@ -563,8 +563,8 @@ static int ceph_show_options(struct seq_file *m, struct dentry *root) · 562 unmodified lines
563 seq_puts(m, ",noacl");563 seq_puts(m, ",noacl");
564#endif564#endif
565 565
566 if (fsopt->flags & CEPH_MOUNT_OPT_NOCOPYFROM)566 if ((fsopt->flags & CEPH_MOUNT_OPT_NOCOPYFROM) == 0)
567 seq_puts(m, ",nocopyfrom");567 seq_puts(m, ",copyfrom");
568 568
569 if (fsopt->mds_namespace)569 if (fsopt->mds_namespace)
570 seq_show_option(m, "mds_namespace", fsopt->mds_namespace);570 seq_show_option(m, "mds_namespace", fsopt->mds_namespace);
fs/ceph/super.h+3−1
@@ -42,7 +42,9 @@ · 41 unmodified lines
42#define CEPH_MOUNT_OPT_NOQUOTADF (1<<13) /* no root dir quota in statfs */42#define CEPH_MOUNT_OPT_NOQUOTADF (1<<13) /* no root dir quota in statfs */
43#define CEPH_MOUNT_OPT_NOCOPYFROM (1<<14) /* don't use RADOS 'copy-from' op */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_DCACHE45#define CEPH_MOUNT_OPT_DEFAULT \
46 (CEPH_MOUNT_OPT_DCACHE | \
47 CEPH_MOUNT_OPT_NOCOPYFROM)
46 48
47#define ceph_set_mount_opt(fsc, opt) \49#define ceph_set_mount_opt(fsc, opt) \
48 (fsc)->mount_options->flags |= CEPH_MOUNT_OPT_##opt;50 (fsc)->mount_options->flags |= CEPH_MOUNT_OPT_##opt;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t