summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-10-11 21:11:35 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2020-10-11 21:11:35 +0300
commit5b697f86f9f136d200c9827d6eca0437b7eb96cf (patch)
treec6e57bb516131f673a9b77293e1a9db136bf1365 /include
parentc120ec12e216225f7536cc1b924fe428ff64b5bd (diff)
parent8a018eb55e3ac033592afbcb476b0ffe64465b12 (diff)
downloadlinux-5b697f86f9f136d200c9827d6eca0437b7eb96cf.tar.xz
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fix from Al Viro: "Fixes an obvious bug (memory leak introduced in 5.8)" * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: pipe: Fix memory leaks in create_pipe_files()
Diffstat (limited to 'include')
-rw-r--r--include/linux/watch_queue.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/watch_queue.h b/include/linux/watch_queue.h
index 5e08db2adc31..c994d1b2cdba 100644
--- a/include/linux/watch_queue.h
+++ b/include/linux/watch_queue.h
@@ -122,6 +122,12 @@ static inline void remove_watch_list(struct watch_list *wlist, u64 id)
*/
#define watch_sizeof(STRUCT) (sizeof(STRUCT) << WATCH_INFO_LENGTH__SHIFT)
+#else
+static inline int watch_queue_init(struct pipe_inode_info *pipe)
+{
+ return -ENOPKG;
+}
+
#endif
#endif /* _LINUX_WATCH_QUEUE_H */