From: Serge E. Hallyn <[EMAIL PROTECTED]>
Subject: [PATCH 1/1] integrity: don't return a value from void function
include/linux/integrity.h:integrity_measure() returns void,
but the non-integrity dummy version does 'return 0;'.
Signed-off-by: Serge E. Hallyn <[EMAIL PROTECTED]>
---
include/linux/integrity.h | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/include/linux/integrity.h b/include/linux/integrity.h
index a318a2f..45f1d0c 100644
--- a/include/linux/integrity.h
+++ b/include/linux/integrity.h
@@ -86,7 +86,7 @@ static inline int integrity_verify_data(
static inline void integrity_measure(struct dentry *dentry,
const unsigned char *filename, int mask)
{
- return integrity_ops->measure(dentry, filename, mask);
+ integrity_ops->measure(dentry, filename, mask);
}
#else
static inline int integrity_verify_metadata(struct dentry *dentry,
@@ -107,7 +107,6 @@ static inline int integrity_verify_data(
static inline void integrity_measure(struct dentry *dentry,
const unsigned char *filename, int mask)
{
- return 0;
}
#endif
#endif
--
1.4.1
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
