diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-12 13:27:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-12 13:27:20 -0700 |
| commit | 5f739e4a491ab63730ef3b7464171340c689fbff (patch) | |
| tree | 0ebf797a2b43ebefac2e5d0ef113b12a57c2b964 /fs/orangefs | |
| parent | a667cb7a94d48a483fb5d6006fe04a440f1a42ce (diff) | |
| parent | 12e1e7af1a55b9f911025365af4c689b3933c22a (diff) | |
| download | linux-5f739e4a491ab63730ef3b7464171340c689fbff.tar.bz2 | |
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull misc vfs updates from Al Viro:
"Assorted fixes (really no common topic here)"
* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
vfs: Make __vfs_write() static
vfs: fix preadv64v2 and pwritev64v2 compat syscalls with offset == -1
pipe: stop using ->can_merge
splice: don't merge into linked buffers
fs: move generic stat response attr handling to vfs_getattr_nosec
orangefs: don't reinitialize result_mask in ->getattr
fs/devpts: always delete dcache dentry-s in dput()
Diffstat (limited to 'fs/orangefs')
| -rw-r--r-- | fs/orangefs/inode.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/orangefs/inode.c b/fs/orangefs/inode.c index f038235c64bd..c3334eca18c7 100644 --- a/fs/orangefs/inode.c +++ b/fs/orangefs/inode.c @@ -261,11 +261,8 @@ int orangefs_getattr(const struct path *path, struct kstat *stat, generic_fillattr(inode, stat); /* override block size reported to stat */ - if (request_mask & STATX_SIZE) - stat->result_mask = STATX_BASIC_STATS; - else - stat->result_mask = STATX_BASIC_STATS & - ~STATX_SIZE; + if (!(request_mask & STATX_SIZE)) + stat->result_mask &= ~STATX_SIZE; stat->attributes_mask = STATX_ATTR_IMMUTABLE | STATX_ATTR_APPEND; |