Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a24cb71 authored by Dave Chinner's avatar Dave Chinner
Browse files

xfs: clean up sign warnings in dir2 code 



We are now consistently using unsigned char strings for names
so fix up the remaining warnings in the dir2 code to complete
the cleanup.

Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent a9273ca5

fs/xfs/xfs_dir2.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -44,7 +44,7 @@ 
#include "xfs_vnodeops.h"

#include "xfs_vnodeops.h"

#include "xfs_trace.h"

#include "xfs_trace.h"





struct xfs_name xfs_name_dotdot = {"..", 2};

struct xfs_name xfs_name_dotdot = { (unsigned char *)"..", 2};





/*

/*

 * ASCII case-insensitive (ie. A-Z) support for directories that was

 * ASCII case-insensitive (ie. A-Z) support for directories that was

fs/xfs/xfs_dir2_block.c

+5 −4
Original line number Original line Diff line number Diff line
@@ -57,8 +57,8 @@ static xfs_dahash_t xfs_dir_hash_dot, xfs_dir_hash_dotdot; 
void

void

xfs_dir_startup(void)

xfs_dir_startup(void)

{

{

	xfs_dir_hash_dot = xfs_da_hashname(".", 1);

	xfs_dir_hash_dot = xfs_da_hashname((unsigned char *)".", 1);

	xfs_dir_hash_dotdot = xfs_da_hashname("..", 2);

	xfs_dir_hash_dotdot = xfs_da_hashname((unsigned char *)"..", 2);

}

}





/*

/*
@@ -513,8 +513,9 @@ xfs_dir2_block_getdents( 
		/*

		/*

		 * If it didn't fit, set the final offset to here & return.

		 * If it didn't fit, set the final offset to here & return.

		 */

		 */

		if (filldir(dirent, dep->name, dep->namelen, cook & 0x7fffffff,

		if (filldir(dirent, (char *)dep->name, dep->namelen,

			    be64_to_cpu(dep->inumber), DT_UNKNOWN)) {

			    cook & 0x7fffffff, be64_to_cpu(dep->inumber),

			    DT_UNKNOWN)) {

			*offset = cook & 0x7fffffff;

			*offset = cook & 0x7fffffff;

			xfs_da_brelse(NULL, bp);

			xfs_da_brelse(NULL, bp);

			return 0;

			return 0;

fs/xfs/xfs_dir2_leaf.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1081,7 +1081,7 @@ xfs_dir2_leaf_getdents( 
		dep = (xfs_dir2_data_entry_t *)ptr;

		dep = (xfs_dir2_data_entry_t *)ptr;

		length = xfs_dir2_data_entsize(dep->namelen);

		length = xfs_dir2_data_entsize(dep->namelen);





		if (filldir(dirent, dep->name, dep->namelen,

		if (filldir(dirent, (char *)dep->name, dep->namelen,

			    xfs_dir2_byte_to_dataptr(mp, curoff) & 0x7fffffff,

			    xfs_dir2_byte_to_dataptr(mp, curoff) & 0x7fffffff,

			    be64_to_cpu(dep->inumber), DT_UNKNOWN))

			    be64_to_cpu(dep->inumber), DT_UNKNOWN))

			break;

			break;

fs/xfs/xfs_dir2_sf.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -782,7 +782,7 @@ xfs_dir2_sf_getdents( 
		}

		}





		ino = xfs_dir2_sf_get_inumber(sfp, xfs_dir2_sf_inumberp(sfep));

		ino = xfs_dir2_sf_get_inumber(sfp, xfs_dir2_sf_inumberp(sfep));

		if (filldir(dirent, sfep->name, sfep->namelen,

		if (filldir(dirent, (char *)sfep->name, sfep->namelen,

			    off & 0x7fffffff, ino, DT_UNKNOWN)) {

			    off & 0x7fffffff, ino, DT_UNKNOWN)) {

			*offset = off & 0x7fffffff;

			*offset = off & 0x7fffffff;

			return 0;

			return 0;