xfs: constify the buffer pointer arguments to error functions

commit d243b89a611e83dc97ce7102419360677a664076 upstream.

Some of the xfs error message functions take a pointer to a buffer that
will be dumped to the system log.  The logging functions don't change
the contents, so constify all the parameters.  This enables the next
patch to ensure that we log bad metadata when we encounter it.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Acked-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Chandan Babu R <chandan.babu@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/xfs/xfs_error.c b/fs/xfs/xfs_error.c
index 849fd4476950af0cbe1086ab3bafdb860bc2c39e..0b156cc881083faf950d48a13b4fab6c41629698 100644 (file)
--- a/fs/xfs/xfs_error.c
+++ b/fs/xfs/xfs_error.c
@@ -329,7 +329,7 @@ xfs_corruption_error(
        const char              *tag,
        int                     level,
        struct xfs_mount        *mp,
-       void                    *buf,
+       const void              *buf,
        size_t                  bufsize,
        const char              *filename,
        int                     linenum,
@@ -350,7 +350,7 @@ xfs_buf_verifier_error(
        struct xfs_buf          *bp,
        int                     error,
        const char              *name,
-       void                    *buf,
+       const void              *buf,
        size_t                  bufsz,
        xfs_failaddr_t          failaddr)
 {
@@ -402,7 +402,7 @@ xfs_inode_verifier_error(
        struct xfs_inode        *ip,
        int                     error,
        const char              *name,
-       void                    *buf,
+       const void              *buf,
        size_t                  bufsz,
        xfs_failaddr_t          failaddr)
 {

diff --git a/fs/xfs/xfs_error.h b/fs/xfs/xfs_error.h
index 602aa7d62b66e09a8133a385805571fe20cf68a5..e6a22cfb542fb3d0ede498f69d5da03bec664537 100644 (file)
--- a/fs/xfs/xfs_error.h
+++ b/fs/xfs/xfs_error.h
@@ -12,16 +12,16 @@ extern void xfs_error_report(const char *tag, int level, struct xfs_mount *mp,
                        const char *filename, int linenum,
                        xfs_failaddr_t failaddr);
 extern void xfs_corruption_error(const char *tag, int level,
-                       struct xfs_mount *mp, void *buf, size_t bufsize,
+                       struct xfs_mount *mp, const void *buf, size_t bufsize,
                        const char *filename, int linenum,
                        xfs_failaddr_t failaddr);
 extern void xfs_buf_verifier_error(struct xfs_buf *bp, int error,
-                       const char *name, void *buf, size_t bufsz,
+                       const char *name, const void *buf, size_t bufsz,
                        xfs_failaddr_t failaddr);
 extern void xfs_verifier_error(struct xfs_buf *bp, int error,
                        xfs_failaddr_t failaddr);
 extern void xfs_inode_verifier_error(struct xfs_inode *ip, int error,
-                       const char *name, void *buf, size_t bufsz,
+                       const char *name, const void *buf, size_t bufsz,
                        xfs_failaddr_t failaddr);
 
 #define        XFS_ERROR_REPORT(e, lvl, mp)    \

diff --git a/fs/xfs/xfs_message.c b/fs/xfs/xfs_message.c
index 9804efe525a9314e4b78a52e7c41c1f88296ffd2..c57e8ad397125cc53737ea65665e4d1e19b11937 100644 (file)
--- a/fs/xfs/xfs_message.c
+++ b/fs/xfs/xfs_message.c
@@ -105,7 +105,7 @@ assfail(char *expr, char *file, int line)
 }
 
 void
-xfs_hex_dump(void *p, int length)
+xfs_hex_dump(const void *p, int length)
 {
        print_hex_dump(KERN_ALERT, "", DUMP_PREFIX_OFFSET, 16, 1, p, length, 1);
 }

diff --git a/fs/xfs/xfs_message.h b/fs/xfs/xfs_message.h
index 34447dca97d136bb36016bfadc5e7312e4b6e5db..7f040b04b7393baea3b070ca0b4353b5b2acab2e 100644 (file)
--- a/fs/xfs/xfs_message.h
+++ b/fs/xfs/xfs_message.h
@@ -60,6 +60,6 @@ do {                                                                  \
 extern void assfail(char *expr, char *f, int l);
 extern void asswarn(char *expr, char *f, int l);
 
-extern void xfs_hex_dump(void *p, int length);
+extern void xfs_hex_dump(const void *p, int length);
 
 #endif /* __XFS_MESSAGE_H */