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 2a1acdeb2e1d8edd86908ab0c243d55258bc17fe..7d7419c76a51e0794fb9c7f905aac71ed3706dfb 100644 (file)
--- 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 a48b96b59c78d575b59c81a53e25cc1b879c0ae2..cb1f05c2c9888f30e400ce3616f9faa41574cebb 100644 (file)
--- 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 e236b3d3e5dba943b4774ac77abc4a95757f8542..4585cf12f99117268a759b9e8c19dd8f3810d7cc 100644 (file)
--- 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;