summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Vagin <avagin@openvz.org>2014-09-09 14:51:06 -0700
committerJiri Slaby <jslaby@suse.cz>2014-10-13 15:41:29 +0200
commit90aec2f784ca7492e9c3f16daac36fa38bb2e3f2 (patch)
treea815f4c97342b556d2f7cc83fefa4f41e7ca6816
parentea8544111ab0a86cd3264b3de190b97d06b4858d (diff)
downloadlwn-90aec2f784ca7492e9c3f16daac36fa38bb2e3f2.tar.gz
lwn-90aec2f784ca7492e9c3f16daac36fa38bb2e3f2.zip
fs/notify: don't show f_handle if exportfs_encode_inode_fh failed
commit 7e8824816bda16bb11ff5ff1e1212d642e57b0b3 upstream. Currently we handle only ENOSPC. In case of other errors the file_handle variable isn't filled properly and we will show a part of stack. Signed-off-by: Andrey Vagin <avagin@openvz.org> Acked-by: Cyrill Gorcunov <gorcunov@openvz.org> Cc: Alexander Viro <viro@zeniv.linux.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
-rw-r--r--fs/notify/fdinfo.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/notify/fdinfo.c b/fs/notify/fdinfo.c
index 660d33bc1bef..9d7e2b9659cb 100644
--- a/fs/notify/fdinfo.c
+++ b/fs/notify/fdinfo.c
@@ -50,7 +50,7 @@ static int show_mark_fhandle(struct seq_file *m, struct inode *inode)
size = f.handle.handle_bytes >> 2;
ret = exportfs_encode_inode_fh(inode, (struct fid *)f.handle.f_handle, &size, 0);
- if ((ret == FILEID_INVALID) || (ret == -ENOSPC)) {
+ if ((ret == FILEID_INVALID) || (ret < 0)) {
WARN_ONCE(1, "Can't encode file handler for inotify: %d\n", ret);
return 0;
}