diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-24 12:26:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-24 12:26:05 -0700 |
| commit | 0eac1102e94807023e57d032bbba51830928b78e (patch) | |
| tree | db67878962cd7392ed205505c165d8db00ecbc50 /fs/ceph | |
| parent | 1b307ac87075c3207c345822ea276fe4f28481d7 (diff) | |
| parent | f2d077ff1b5c17008cff5dc27e7356a694e55462 (diff) | |
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull misc vfs updates from Al Viro:
"Assorted stuff all over the place (the largest group here is
Christoph's stat cleanups)"
* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
fs: remove KSTAT_QUERY_FLAGS
fs: remove vfs_stat_set_lookup_flags
fs: move vfs_fstatat out of line
fs: implement vfs_stat and vfs_lstat in terms of vfs_fstatat
fs: remove vfs_statx_fd
fs: omfs: use kmemdup() rather than kmalloc+memcpy
[PATCH] reduce boilerplate in fsid handling
fs: Remove duplicated flag O_NDELAY occurring twice in VALID_OPEN_FLAGS
selftests: mount: add nosymfollow tests
Add a "nosymfollow" mount option.
Diffstat (limited to 'fs/ceph')
| -rw-r--r-- | fs/ceph/super.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ceph/super.c b/fs/ceph/super.c index 2516304379d3..33ba6f0aa55c 100644 --- a/fs/ceph/super.c +++ b/fs/ceph/super.c @@ -104,8 +104,7 @@ static int ceph_statfs(struct dentry *dentry, struct kstatfs *buf) le64_to_cpu(*((__le64 *)&monc->monmap->fsid + 1)); mutex_unlock(&monc->mutex); - buf->f_fsid.val[0] = fsid & 0xffffffff; - buf->f_fsid.val[1] = fsid >> 32; + buf->f_fsid = u64_to_fsid(fsid); return 0; } |