Project

General

Profile

Bug #1746 » libzfs-fixes.diff

Andrew Stormont, 2011-11-08 01:09 AM

View differences:

usr/src/lib/libzfs/common/libzfs_changelist.c Mon Nov 07 07:38:50 2011 +0000 → usr/src/lib/libzfs/common/libzfs_changelist.c Mon Nov 07 14:24:13 2011 +0000
34 34
#include <unistd.h>
35 35
#include <zone.h>
36 36

  
37
#include <libzfs.h>
38

  
37
#include "libzfs.h"
39 38
#include "libzfs_impl.h"
40 39

  
41 40
/*
usr/src/lib/libzfs/common/libzfs_dataset.c Mon Nov 07 07:38:50 2011 +0000 → usr/src/lib/libzfs/common/libzfs_dataset.c Mon Nov 07 14:24:13 2011 +0000
50 50
#include <sys/dnode.h>
51 51
#include <sys/spa.h>
52 52
#include <sys/zap.h>
53
#include <libzfs.h>
54

  
53

  
54
#include "libzfs.h"
55 55
#include "zfs_namecheck.h"
56 56
#include "zfs_prop.h"
57 57
#include "libzfs_impl.h"
usr/src/lib/libzfs/common/libzfs_diff.c Mon Nov 07 07:38:50 2011 +0000 → usr/src/lib/libzfs/common/libzfs_diff.c Mon Nov 07 14:24:13 2011 +0000
41 41
#include <stropts.h>
42 42
#include <pthread.h>
43 43
#include <sys/zfs_ioctl.h>
44
#include <libzfs.h>
44

  
45
#include "libzfs.h"
45 46
#include "libzfs_impl.h"
46 47

  
47 48
#define	ZDIFF_SNAPDIR		"/.zfs/snapshot/"
usr/src/lib/libzfs/common/libzfs_fru.c Mon Nov 07 07:38:50 2011 +0000 → usr/src/lib/libzfs/common/libzfs_fru.c Mon Nov 07 14:24:13 2011 +0000
32 32
#include <strings.h>
33 33
#include <unistd.h>
34 34

  
35
#include <libzfs.h>
36

  
37 35
#include <fm/libtopo.h>
38 36
#include <sys/fm/protocol.h>
39 37
#include <sys/systeminfo.h>
40 38

  
39
#include "libzfs.h"
41 40
#include "libzfs_impl.h"
42 41

  
43 42
/*
usr/src/lib/libzfs/common/libzfs_impl.h Mon Nov 07 07:38:50 2011 +0000 → usr/src/lib/libzfs/common/libzfs_impl.h Mon Nov 07 14:24:13 2011 +0000
33 33
#include <sys/spa.h>
34 34
#include <sys/nvpair.h>
35 35

  
36
#include "libzfs.h"
37

  
36 38
#include <libuutil.h>
37
#include <libzfs.h>
38 39
#include <libshare.h>
39

  
40 40
#include <fm/libtopo.h>
41 41

  
42 42
#ifdef	__cplusplus
usr/src/lib/libzfs/common/libzfs_iter.c Mon Nov 07 07:38:50 2011 +0000 → usr/src/lib/libzfs/common/libzfs_iter.c Mon Nov 07 14:24:13 2011 +0000
31 31
#include <unistd.h>
32 32
#include <stddef.h>
33 33
#include <libintl.h>
34
#include <libzfs.h>
35 34

  
35
#include "libzfs.h"
36 36
#include "libzfs_impl.h"
37 37

  
38 38
int
usr/src/lib/libzfs/common/libzfs_mount.c Mon Nov 07 07:38:50 2011 +0000 → usr/src/lib/libzfs/common/libzfs_mount.c Mon Nov 07 14:24:13 2011 +0000
73 73
#include <sys/mount.h>
74 74
#include <sys/stat.h>
75 75

  
76
#include <libzfs.h>
77

  
76
#include "libzfs.h"
78 77
#include "libzfs_impl.h"
79 78

  
80 79
#include <libshare.h>
usr/src/lib/libzfs/common/libzfs_sendrecv.c Mon Nov 07 07:38:50 2011 +0000 → usr/src/lib/libzfs/common/libzfs_sendrecv.c Mon Nov 07 14:24:13 2011 +0000
38 38
#include <pthread.h>
39 39
#include <umem.h>
40 40

  
41
#include <libzfs.h>
42

  
41
#include "libzfs.h"
43 42
#include "zfs_namecheck.h"
44 43
#include "zfs_prop.h"
45 44
#include "zfs_fletcher.h"
46 45
#include "libzfs_impl.h"
46

  
47 47
#include <sha2.h>
48 48
#include <sys/zio_checksum.h>
49 49
#include <sys/ddt.h>
usr/src/lib/libzfs/common/libzfs_status.c Mon Nov 07 07:38:50 2011 +0000 → usr/src/lib/libzfs/common/libzfs_status.c Mon Nov 07 14:24:13 2011 +0000
38 38
 * import.
39 39
 */
40 40

  
41
#include <libzfs.h>
42 41
#include <string.h>
43 42
#include <unistd.h>
43
#include "libzfs.h"
44 44
#include "libzfs_impl.h"
45 45

  
46 46
/*
usr/src/lib/libzfs/common/libzfs_util.c Mon Nov 07 07:38:50 2011 +0000 → usr/src/lib/libzfs/common/libzfs_util.c Mon Nov 07 14:24:13 2011 +0000
41 41
#include <sys/mntent.h>
42 42
#include <sys/types.h>
43 43

  
44
#include <libzfs.h>
45

  
44
#include "libzfs.h"
46 45
#include "libzfs_impl.h"
47 46
#include "zfs_prop.h"
48 47

  
usr/src/lib/libzfs/common/llib-lzfs Mon Nov 07 07:38:50 2011 +0000 → usr/src/lib/libzfs/common/llib-lzfs Mon Nov 07 14:24:13 2011 +0000
27 27
/*LINTLIBRARY*/
28 28
/*PROTOLIB1*/
29 29

  
30
#include <libzfs.h>
30
#include "../../../common/zfs/libzfs.h"
31 31
#include "../../../common/zfs/zfs_comutil.h"
32 32
#include "../../../common/zfs/zfs_fletcher.h"
33 33
#include "../../../common/zfs/zfs_prop.h"
    (1-1/1)