Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Changes to support zfs encryption 

Unused modlinkage struct removed and ntohll functions added.

Signed-off-by: Tom Caputi <tcaputi@datto.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #533
This commit is contained in:
Tom Caputi 2016-02-18 18:24:29 -05:00 committed by Brian Behlendorf
parent 0b43696e66
commit 18d2f56176
2 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
include/sys/byteorder.h
View File

@ -26,6 +26,7 @@
#define _SPL_BYTEORDER_H #define _SPL_BYTEORDER_H
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <sys/isa_defs.h>
#define LE_16(x) cpu_to_le16(x) #define LE_16(x) cpu_to_le16(x)
#define LE_32(x) cpu_to_le32(x) #define LE_32(x) cpu_to_le32(x)
@ -43,4 +44,26 @@
#define BE_IN32(xa) \ #define BE_IN32(xa) \
(((uint32_t)BE_IN16(xa) << 16) | BE_IN16((uint8_t *)(xa)+2)) (((uint32_t)BE_IN16(xa) << 16) | BE_IN16((uint8_t *)(xa)+2))
#ifdef _BIG_ENDIAN
static __inline__ uint64_t
htonll(uint64_t n) {
return (n);
}
static __inline__ uint64_t
ntohll(uint64_t n) {
return (n);
}
#else
static __inline__ uint64_t
htonll(uint64_t n) {
return ((((uint64_t)htonl(n)) << 32) + htonl(n >> 32));
}
static __inline__ uint64_t
ntohll(uint64_t n) {
return ((((uint64_t)ntohl(n)) << 32) + ntohl(n >> 32));
}
#endif
#endif /* SPL_BYTEORDER_H */ #endif /* SPL_BYTEORDER_H */

19
include/sys/sunldi.h
View File

@ -34,23 +34,4 @@
#define SECTOR_SIZE 512 #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 */ #endif /* SPL_SUNLDI_H */