Skip to content

L
linux
Commit 61bcd68e authored by Keith Owens's avatar Keith Owens Committed by Christoph Hellwig
Browse files
Options

[XFS] XFS patches from 2.5.60-mm1 

SGI Modid: 2.5.x-xfs:slinx:139330a
parent 955bf21e
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
fs/xfs/support/debug.c
View file @ 61bcd68e
...@@ -86,7 +86,7 @@ cmn_err(register int level, char *fmt, ...) ...@@ -86,7 +86,7 @@ cmn_err(register int level, char *fmt, ...)
{ {
char *fp = fmt; char *fp = fmt;
int len; int len;
int flags; unsigned long flags;
va_list ap; va_list ap;
level &= XFS_ERR_MASK; level &= XFS_ERR_MASK;
......
fs/xfs/xfs_error.h
View file @ 61bcd68e
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#define __XFS_ERROR_H__ #define __XFS_ERROR_H__
#define prdev(fmt,dev,args...) \ #define prdev(fmt,dev,args...) \
printk("XFS: device 0x%x- " fmt "\n", dev, ## args) printk("XFS: device 0x%x- " fmt "\n", (unsigned)dev, ## args)
#define XFS_ERECOVER 1 /* Failure to recover log */ #define XFS_ERECOVER 1 /* Failure to recover log */
#define XFS_ELOGSTAT 2 /* Failure to stat log in user space */ #define XFS_ELOGSTAT 2 /* Failure to stat log in user space */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7