[2/4] ceph: fix endianness bug in frag_tree_split_cmp
diff mbox

Message ID 1484237565-27423-3-git-send-email-jlayton@redhat.com
State New
Headers show

Commit Message

Jeff Layton Jan. 12, 2017, 4:12 p.m. UTC
sparse says:

fs/ceph/inode.c:308:36: warning: incorrect type in argument 1 (different base types)
fs/ceph/inode.c:308:36:    expected unsigned int [unsigned] [usertype] a
fs/ceph/inode.c:308:36:    got restricted __le32 [usertype] frag
fs/ceph/inode.c:308:46: warning: incorrect type in argument 2 (different base types)
fs/ceph/inode.c:308:46:    expected unsigned int [unsigned] [usertype] b
fs/ceph/inode.c:308:46:    got restricted __le32 [usertype] frag

I think we need to convert these values to host-endian before calling
the comparator.

Fixes: a407846ef7c6e (ceph: don't assume frag tree splits in mds reply are sorted)
Signed-off-by: Jeff Layton <jlayton@redhat.com>
---
 fs/ceph/inode.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Patch
diff mbox

diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
index 1476f54ed118..4926265f4223 100644
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -305,7 +305,8 @@  static int frag_tree_split_cmp(const void *l, const void *r)
 {
 	struct ceph_frag_tree_split *ls = (struct ceph_frag_tree_split*)l;
 	struct ceph_frag_tree_split *rs = (struct ceph_frag_tree_split*)r;
-	return ceph_frag_compare(ls->frag, rs->frag);
+	return ceph_frag_compare(le32_to_cpu(ls->frag),
+				 le32_to_cpu(rs->frag));
 }
 
 static bool is_frag_child(u32 f, struct ceph_inode_frag *frag)