changes to support zfs encryption: Unused modlinkage struct removed a…

…nd ntohll functions added.
openzfs · Feb 21, 2016 · 8077eca · 8077eca
1 parent 8f3b403
commit 8077eca
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 19 deletions.
diff --git a/include/sys/byteorder.h b/include/sys/byteorder.h
@@ -26,6 +26,7 @@
 #define _SPL_BYTEORDER_H
 
 #include <asm/byteorder.h>
+#include <sys/isa_defs.h>
 
 #define LE_16(x)	cpu_to_le16(x)
 #define LE_32(x)	cpu_to_le32(x)
@@ -43,4 +44,12 @@
 #define BE_IN32(xa) \
 	(((uint32_t)BE_IN16(xa) << 16) | BE_IN16((uint8_t *)(xa)+2))
 
+#ifdef _BIG_ENDIAN
+#define	htonll(x)	(x)
+#define ntohll(x)	(x)
+#else
+#define	htonll(x)	((((uint64_t)htonl(x)) << 32) + htonl((x) >> 32))
+#define ntohll(x)	((((uint64_t)ntohl(x)) << 32) + ntohl((x) >> 32))
+#endif
+
 #endif /* SPL_BYTEORDER_H */
diff --git a/include/sys/sunldi.h b/include/sys/sunldi.h
@@ -34,23 +34,4 @@
 
 #define SECTOR_SIZE 512
 
-typedef struct modlinkage {
-	int ml_rev;
-	struct modlfs *ml_modlfs;
-	struct modldrv *ml_modldrv;
-	major_t ml_major;
-	unsigned ml_minors;
-	void *pad1;
-} modlinkage_t;
-
-typedef struct ldi_ident {
-	char li_modname[MAXNAMELEN];
-	dev_t li_dev;
-} *ldi_ident_t;
-
-typedef struct block_device *ldi_handle_t;
-
-extern int ldi_ident_from_mod(struct modlinkage *modlp, ldi_ident_t *lip);
-extern void ldi_ident_release(ldi_ident_t li);
-
 #endif /* SPL_SUNLDI_H */