From: Nathan Scott Date: Sat, 8 Oct 2005 03:47:16 +0000 (+0000) Subject: Merge back some kernel changes to fix warnings from gcc. X-Git-Tag: v2.8.0~85 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80ce5460a8eb4b3bea498f1e359018eb16368106;p=thirdparty%2Fxfsprogs-dev.git Merge back some kernel changes to fix warnings from gcc. Merge of master-melb:xfs-cmds:24038a by kenmcd. --- diff --git a/include/libxfs.h b/include/libxfs.h index 2a1acdeb2..7d7419c76 100644 --- a/include/libxfs.h +++ b/include/libxfs.h @@ -469,7 +469,7 @@ extern int libxfs_alloc_fix_freelist (xfs_alloc_arg_t *, int); extern int libxfs_alloc_file_space (xfs_inode_t *, xfs_off_t, xfs_off_t, int, int); -extern xfs_dahash_t libxfs_da_hashname (uchar_t *, int); +extern xfs_dahash_t libxfs_da_hashname (const uchar_t *, int); extern int libxfs_attr_leaf_newentsize (int, int, int, int *); extern int libxfs_attr_set_int (xfs_inode_t*, const char *, int, char *, int, int); diff --git a/include/xfs_da_btree.h b/include/xfs_da_btree.h index a48b96b59..cb1f05c2c 100644 --- a/include/xfs_da_btree.h +++ b/include/xfs_da_btree.h @@ -316,7 +316,7 @@ xfs_daddr_t xfs_da_reada_buf(struct xfs_trans *trans, struct xfs_inode *dp, int xfs_da_shrink_inode(xfs_da_args_t *args, xfs_dablk_t dead_blkno, xfs_dabuf_t *dead_buf); -uint xfs_da_hashname(uchar_t *name_string, int name_length); +uint xfs_da_hashname(const uchar_t *name_string, int name_length); uint xfs_da_log2_roundup(uint i); xfs_da_state_t *xfs_da_state_alloc(void); void xfs_da_state_free(xfs_da_state_t *state); diff --git a/libxfs/xfs_da_btree.c b/libxfs/xfs_da_btree.c index e236b3d3e..4585cf12f 100644 --- a/libxfs/xfs_da_btree.c +++ b/libxfs/xfs_da_btree.c @@ -1526,7 +1526,7 @@ xfs_da_path_shift(xfs_da_state_t *state, xfs_da_state_path_t *path, * This is implemented with some source-level loop unrolling. */ xfs_dahash_t -xfs_da_hashname(uchar_t *name, int namelen) +xfs_da_hashname(const uchar_t *name, int namelen) { xfs_dahash_t hash;