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/hfsplus | |
| parent | Merge tag 'dma-mapping-5.10-1' of git://git.infradead.org/users/hch/dma-mapping (diff) | |
| parent | fs: remove KSTAT_QUERY_FLAGS (diff) | |
| download | linux-0eac1102e94807023e57d032bbba51830928b78e.tar.gz linux-0eac1102e94807023e57d032bbba51830928b78e.tar.bz2 linux-0eac1102e94807023e57d032bbba51830928b78e.zip | |
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/hfsplus')
| -rw-r--r-- | fs/hfsplus/super.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c index 129dca3f4b78..807119ae5adf 100644 --- a/fs/hfsplus/super.c +++ b/fs/hfsplus/super.c @@ -320,8 +320,7 @@ static int hfsplus_statfs(struct dentry *dentry, struct kstatfs *buf) buf->f_bavail = buf->f_bfree; buf->f_files = 0xFFFFFFFF; buf->f_ffree = 0xFFFFFFFF - sbi->next_cnid; - buf->f_fsid.val[0] = (u32)id; - buf->f_fsid.val[1] = (u32)(id >> 32); + buf->f_fsid = u64_to_fsid(id); buf->f_namelen = HFSPLUS_MAX_STRLEN; return 0; |