diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-14 14:42:31 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-14 14:42:31 -0800 |
commit | cf556edfde6cfc293ce63de02ac23f725e41dfb1 (patch) | |
tree | 4e888c8415c948f0278ed14af4c7c4f35edd5397 /fs/ceph/super.h | |
parent | ca60ad6a6bc4aa88c02c6f103dd80df54689ea4d (diff) | |
parent | 3b20bc2fe4c0cfd82d35838965dc7ff0b93415c6 (diff) | |
download | linux-cf556edfde6cfc293ce63de02ac23f725e41dfb1.tar.bz2 |
Merge tag 'ceph-for-5.6-rc2' of https://github.com/ceph/ceph-client
Pull ceph fixes from Ilya Dryomov:
- make O_DIRECT | O_APPEND combination work better
- redo the server path canonicalization patch that went into -rc1
- fix the 'noacl' mount option that got broken by the conversion to the
new mount API in 5.5
* tag 'ceph-for-5.6-rc2' of https://github.com/ceph/ceph-client:
ceph: noacl mount option is effectively ignored
ceph: canonicalize server path in place
ceph: do not execute direct write in parallel if O_APPEND is specified
Diffstat (limited to 'fs/ceph/super.h')
-rw-r--r-- | fs/ceph/super.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ceph/super.h b/fs/ceph/super.h index 1e456a9011bb..037cdfb2ad4f 100644 --- a/fs/ceph/super.h +++ b/fs/ceph/super.h @@ -91,7 +91,7 @@ struct ceph_mount_options { char *snapdir_name; /* default ".snap" */ char *mds_namespace; /* default NULL */ - char *server_path; /* default "/" */ + char *server_path; /* default NULL (means "/") */ char *fscache_uniq; /* default NULL */ }; |