diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-12 09:49:01 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-12 09:49:01 +0200 |
| commit | 08d27eb2066622cd659b91d877d0406ebd651225 (patch) | |
| tree | cad7f2c4efa8e503a2cc301a2d454fb9bff1c6c0 /include | |
| parent | Linux 4.7-rc7 (diff) | |
| parent | posix_acl: de-union a_refcount and a_rcu (diff) | |
| download | linux-08d27eb2066622cd659b91d877d0406ebd651225.tar.xz linux-08d27eb2066622cd659b91d877d0406ebd651225.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fixes from Al Viro.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
posix_acl: de-union a_refcount and a_rcu
nfs_atomic_open(): prevent parallel nfs_lookup() on a negative hashed
Use the right predicate in ->atomic_open() instances
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/posix_acl.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/posix_acl.h b/include/linux/posix_acl.h index 5b5a80cc5926..c818772d9f9d 100644 --- a/include/linux/posix_acl.h +++ b/include/linux/posix_acl.h @@ -43,10 +43,8 @@ struct posix_acl_entry { }; struct posix_acl { - union { - atomic_t a_refcount; - struct rcu_head a_rcu; - }; + atomic_t a_refcount; + struct rcu_head a_rcu; unsigned int a_count; struct posix_acl_entry a_entries[0]; }; |