diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-05 23:06:06 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-05 23:06:06 -0800 |
| commit | 6989606a7224a2d5a925df22a49e4f7a0bfed0d6 (patch) | |
| tree | 2fb686a4dea9a7f4beec97fde510f2840c8e06f9 /include | |
| parent | ed40875dd4b4c7b5c991db9e06c984180ab0b3ce (diff) | |
| parent | be29d20f3f5db1f0b4e49a4f6eeedf840e2bf9b1 (diff) | |
| download | lwn-6989606a7224a2d5a925df22a49e4f7a0bfed0d6.tar.gz lwn-6989606a7224a2d5a925df22a49e4f7a0bfed0d6.zip | |
Merge branch 'stable-4.10' of git://git.infradead.org/users/pcmoore/audit
Pull audit fixes from Paul Moore:
"Two small fixes relating to audit's use of fsnotify.
The first patch plugs a leak and the second fixes some lock
shenanigans. The patches are small and I banged on this for an
afternoon with our testsuite and didn't see anything odd"
* 'stable-4.10' of git://git.infradead.org/users/pcmoore/audit:
audit: Fix sleep in atomic
fsnotify: Remove fsnotify_duplicate_mark()
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fsnotify_backend.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h index 0cf34d6cc253..487246546ebe 100644 --- a/include/linux/fsnotify_backend.h +++ b/include/linux/fsnotify_backend.h @@ -323,8 +323,6 @@ extern void fsnotify_init_mark(struct fsnotify_mark *mark, void (*free_mark)(str extern struct fsnotify_mark *fsnotify_find_inode_mark(struct fsnotify_group *group, struct inode *inode); /* find (and take a reference) to a mark associated with group and vfsmount */ extern struct fsnotify_mark *fsnotify_find_vfsmount_mark(struct fsnotify_group *group, struct vfsmount *mnt); -/* copy the values from old into new */ -extern void fsnotify_duplicate_mark(struct fsnotify_mark *new, struct fsnotify_mark *old); /* set the ignored_mask of a mark */ extern void fsnotify_set_mark_ignored_mask_locked(struct fsnotify_mark *mark, __u32 mask); /* set the mask of a mark (might pin the object into memory */ |