summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-04-25 21:23:38 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2018-04-25 21:23:38 -0700
commit69bfd470f4623d2d57ad62cb33791cded0c662f4 (patch)
tree7161b8023f2af23404b2c483c0ee884aa343b753
parent3442097b765c3e89fe3afe755054e6683b140f6d (diff)
parentd90a10e2444ba5a351fa695917258ff4c5709fa5 (diff)
downloadlinux-69bfd470f4623d2d57ad62cb33791cded0c662f4.tar.bz2
Merge tag 'for_v4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull fsnotify fix from Jan Kara: "A fix of a fsnotify race causing panics / softlockups" * tag 'for_v4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs: fsnotify: Fix fsnotify_mark_connector race
-rw-r--r--include/linux/fsnotify_backend.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h
index e0c95c9f1e29..e64c0294f50b 100644
--- a/include/linux/fsnotify_backend.h
+++ b/include/linux/fsnotify_backend.h
@@ -217,12 +217,10 @@ struct fsnotify_mark_connector {
union { /* Object pointer [lock] */
struct inode *inode;
struct vfsmount *mnt;
- };
- union {
- struct hlist_head list;
/* Used listing heads to free after srcu period expires */
struct fsnotify_mark_connector *destroy_next;
};
+ struct hlist_head list;
};
/*