diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-19 13:36:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-19 13:36:00 -0800 |
| commit | 87d9ac712b727705dc07e05e851e84387397d696 (patch) | |
| tree | fabd1de9442136eadf6dda41f184f5000272534d /include | |
| parent | 23300f657594656e7ebac3130b43460ebc4381cc (diff) | |
| parent | 52b4b950b50740bff507a62907e86710743c22e7 (diff) | |
| download | linux-rpi3-87d9ac712b727705dc07e05e851e84387397d696.tar.gz linux-rpi3-87d9ac712b727705dc07e05e851e84387397d696.tar.bz2 linux-rpi3-87d9ac712b727705dc07e05e851e84387397d696.zip | |
Merge branch 'akpm' (patches from Andrew)
Merge fixes from Andrew Morton:
"10 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
mm: slab: free kmem_cache_node after destroy sysfs file
ipc/shm: handle removed segments gracefully in shm_mmap()
MAINTAINERS: update Kselftest Framework mailing list
devm_memremap_release(): fix memremap'd addr handling
mm/hugetlb.c: fix incorrect proc nr_hugepages value
mm, x86: fix pte_page() crash in gup_pte_range()
fsnotify: turn fsnotify reaper thread into a workqueue job
Revert "fsnotify: destroy marks with call_srcu instead of dedicated thread"
mm: fix regression in remap_file_pages() emulation
thp, dax: do not try to withdraw pgtable from non-anon VMA
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fsnotify_backend.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h index 6b7e89f45aa4..533c4408529a 100644 --- a/include/linux/fsnotify_backend.h +++ b/include/linux/fsnotify_backend.h @@ -220,10 +220,7 @@ struct fsnotify_mark { /* List of marks by group->i_fsnotify_marks. Also reused for queueing * mark into destroy_list when it's waiting for the end of SRCU period * before it can be freed. [group->mark_mutex] */ - union { - struct list_head g_list; - struct rcu_head g_rcu; - }; + struct list_head g_list; /* Protects inode / mnt pointers, flags, masks */ spinlock_t lock; /* List of marks for inode / vfsmount [obj_lock] */ |