History

Merge tag 'ceph-for-5.17-rc1' of git://github.com/ceph/ceph-client

Pull ceph updates from Ilya Dryomov: "The highlight is the new mount "device" string syntax implemented by Venky Shankar. It solves some long-standing issues with using different auth entities and/or mounting different CephFS filesystems from the same cluster, remounting and also misleading /proc/mounts contents. The existing syntax of course remains to be maintained. On top of that, there is a couple of fixes for edge cases in quota and a new mount option for turning on unbuffered I/O mode globally instead of on a per-file basis with ioctl(CEPH_IOC_SYNCIO)" * tag 'ceph-for-5.17-rc1' of git://github.com/ceph/ceph-client: ceph: move CEPH_SUPER_MAGIC definition to magic.h ceph: remove redundant Lsx caps check ceph: add new "nopagecache" option ceph: don't check for quotas on MDS stray dirs ceph: drop send metrics debug message rbd: make const pointer spaces a static const array ceph: Fix incorrect statfs report for small quota ceph: mount syntax module parameter doc: document new CephFS mount device syntax ceph: record updated mon_addr on remount ceph: new device mount syntax libceph: rename parse_fsid() to ceph_parse_fsid() and export libceph: generalize addr/ip parsing based on delimiter

Linus Torvalds committed 4 years ago

Commit 64f29d82 parents 67ed868 a0b3a1513 files · +255 −57Browse files

Showing the changes to include/uapi/linux (1 of 13 files). Show all

Unified · Split

include/uapi/linux/magic.h+1−0
@@ -6,6 +6,7 @@ · 5 unmodified lines
66 #define AFFS_SUPER_MAGIC 0xadff
77 #define AFS_SUPER_MAGIC 0x5346414F
88 #define AUTOFS_SUPER_MAGIC 0x0187
9+#define CEPH_SUPER_MAGIC 0x00c36400
910 #define CODA_SUPER_MAGIC 0x73757245
1011 #define CRAMFS_MAGIC 0x28cd3d45 /* some random number */
1112 #define CRAMFS_MAGIC_WEND 0x453dcd28 /* magic number with the wrong endianess */

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