Преглед на файлове

xfs: fix issues that cause userspace warnings

Some of the code shared with userspace causes compilation warnings
from things turned off in the kernel code, such as differences in
variable signedness. Fix those issues.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Mark Tinguely <tinguely@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
Dave Chinner преди 12 години
родител
ревизия
836a94ad59
променени са 6 файла, в които са добавени 12 реда и са изтрити 13 реда
  1. 4 4
      fs/xfs/xfs_attr_remote.c
  2. 0 3
      fs/xfs/xfs_bmap.c
  3. 3 3
      fs/xfs/xfs_da_btree.c
  4. 2 0
      fs/xfs/xfs_dir2_node.c
  5. 1 1
      fs/xfs/xfs_ialloc.c
  6. 2 2
      fs/xfs/xfs_rtalloc.c

+ 4 - 4
fs/xfs/xfs_attr_remote.c

@@ -239,7 +239,7 @@ xfs_attr_rmtval_copyout(
 	xfs_ino_t	ino,
 	xfs_ino_t	ino,
 	int		*offset,
 	int		*offset,
 	int		*valuelen,
 	int		*valuelen,
-	char		**dst)
+	__uint8_t	**dst)
 {
 {
 	char		*src = bp->b_addr;
 	char		*src = bp->b_addr;
 	xfs_daddr_t	bno = bp->b_bn;
 	xfs_daddr_t	bno = bp->b_bn;
@@ -286,7 +286,7 @@ xfs_attr_rmtval_copyin(
 	xfs_ino_t	ino,
 	xfs_ino_t	ino,
 	int		*offset,
 	int		*offset,
 	int		*valuelen,
 	int		*valuelen,
-	char		**src)
+	__uint8_t	**src)
 {
 {
 	char		*dst = bp->b_addr;
 	char		*dst = bp->b_addr;
 	xfs_daddr_t	bno = bp->b_bn;
 	xfs_daddr_t	bno = bp->b_bn;
@@ -339,7 +339,7 @@ xfs_attr_rmtval_get(
 	struct xfs_mount	*mp = args->dp->i_mount;
 	struct xfs_mount	*mp = args->dp->i_mount;
 	struct xfs_buf		*bp;
 	struct xfs_buf		*bp;
 	xfs_dablk_t		lblkno = args->rmtblkno;
 	xfs_dablk_t		lblkno = args->rmtblkno;
-	char			*dst = args->value;
+	__uint8_t		*dst = args->value;
 	int			valuelen = args->valuelen;
 	int			valuelen = args->valuelen;
 	int			nmap;
 	int			nmap;
 	int			error;
 	int			error;
@@ -403,7 +403,7 @@ xfs_attr_rmtval_set(
 	struct xfs_bmbt_irec	map;
 	struct xfs_bmbt_irec	map;
 	xfs_dablk_t		lblkno;
 	xfs_dablk_t		lblkno;
 	xfs_fileoff_t		lfileoff = 0;
 	xfs_fileoff_t		lfileoff = 0;
-	char			*src = args->value;
+	__uint8_t		*src = args->value;
 	int			blkcnt;
 	int			blkcnt;
 	int			valuelen;
 	int			valuelen;
 	int			nmap;
 	int			nmap;

+ 0 - 3
fs/xfs/xfs_bmap.c

@@ -4258,12 +4258,9 @@ __xfs_bmapi_allocate(
 	struct xfs_ifork	*ifp = XFS_IFORK_PTR(bma->ip, whichfork);
 	struct xfs_ifork	*ifp = XFS_IFORK_PTR(bma->ip, whichfork);
 	int			tmp_logflags = 0;
 	int			tmp_logflags = 0;
 	int			error;
 	int			error;
-	int			rt;
 
 
 	ASSERT(bma->length > 0);
 	ASSERT(bma->length > 0);
 
 
-	rt = (whichfork == XFS_DATA_FORK) && XFS_IS_REALTIME_INODE(bma->ip);
-
 	/*
 	/*
 	 * For the wasdelay case, we could also just allocate the stuff asked
 	 * For the wasdelay case, we could also just allocate the stuff asked
 	 * for in this bmap call but that wouldn't be as good.
 	 * for in this bmap call but that wouldn't be as good.

+ 3 - 3
fs/xfs/xfs_da_btree.c

@@ -399,7 +399,7 @@ xfs_da3_split(
 	struct xfs_da_intnode	*node;
 	struct xfs_da_intnode	*node;
 	struct xfs_buf		*bp;
 	struct xfs_buf		*bp;
 	int			max;
 	int			max;
-	int			action;
+	int			action = 0;
 	int			error;
 	int			error;
 	int			i;
 	int			i;
 
 
@@ -2454,9 +2454,9 @@ static int
 xfs_buf_map_from_irec(
 xfs_buf_map_from_irec(
 	struct xfs_mount	*mp,
 	struct xfs_mount	*mp,
 	struct xfs_buf_map	**mapp,
 	struct xfs_buf_map	**mapp,
-	unsigned int		*nmaps,
+	int			*nmaps,
 	struct xfs_bmbt_irec	*irecs,
 	struct xfs_bmbt_irec	*irecs,
-	unsigned int		nirecs)
+	int			nirecs)
 {
 {
 	struct xfs_buf_map	*map;
 	struct xfs_buf_map	*map;
 	int			i;
 	int			i;

+ 2 - 0
fs/xfs/xfs_dir2_node.c

@@ -313,11 +313,13 @@ xfs_dir2_free_log_header(
 	struct xfs_trans	*tp,
 	struct xfs_trans	*tp,
 	struct xfs_buf		*bp)
 	struct xfs_buf		*bp)
 {
 {
+#ifdef DEBUG
 	xfs_dir2_free_t		*free;		/* freespace structure */
 	xfs_dir2_free_t		*free;		/* freespace structure */
 
 
 	free = bp->b_addr;
 	free = bp->b_addr;
 	ASSERT(free->hdr.magic == cpu_to_be32(XFS_DIR2_FREE_MAGIC) ||
 	ASSERT(free->hdr.magic == cpu_to_be32(XFS_DIR2_FREE_MAGIC) ||
 	       free->hdr.magic == cpu_to_be32(XFS_DIR3_FREE_MAGIC));
 	       free->hdr.magic == cpu_to_be32(XFS_DIR3_FREE_MAGIC));
+#endif
 	xfs_trans_log_buf(tp, bp, 0, xfs_dir3_free_hdr_size(tp->t_mountp) - 1);
 	xfs_trans_log_buf(tp, bp, 0, xfs_dir3_free_hdr_size(tp->t_mountp) - 1);
 }
 }
 
 

+ 1 - 1
fs/xfs/xfs_ialloc.c

@@ -1342,7 +1342,7 @@ xfs_imap(
 	xfs_agblock_t	cluster_agbno;	/* first block in inode cluster */
 	xfs_agblock_t	cluster_agbno;	/* first block in inode cluster */
 	int		error;	/* error code */
 	int		error;	/* error code */
 	int		offset;	/* index of inode in its buffer */
 	int		offset;	/* index of inode in its buffer */
-	int		offset_agbno;	/* blks from chunk start to inode */
+	xfs_agblock_t	offset_agbno;	/* blks from chunk start to inode */
 
 
 	ASSERT(ino != NULLFSINO);
 	ASSERT(ino != NULLFSINO);
 
 

+ 2 - 2
fs/xfs/xfs_rtalloc.c

@@ -736,8 +736,8 @@ xfs_rtallocate_range(
 {
 {
 	xfs_rtblock_t	end;		/* end of the allocated extent */
 	xfs_rtblock_t	end;		/* end of the allocated extent */
 	int		error;		/* error value */
 	int		error;		/* error value */
-	xfs_rtblock_t	postblock;	/* first block allocated > end */
-	xfs_rtblock_t	preblock;	/* first block allocated < start */
+	xfs_rtblock_t	postblock = 0;	/* first block allocated > end */
+	xfs_rtblock_t	preblock = 0;	/* first block allocated < start */
 
 
 	end = start + len - 1;
 	end = start + len - 1;
 	/*
 	/*