diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-03-06 13:07:55 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-03-06 13:07:55 +0000 |
| commit | cedddd0bb5c808632ca226e9f66ab136098d1b2c (patch) | |
| tree | 971adb1381c693aa122361817677be4dc3cb3d50 /usr/src/lib/libshare/common/libshare.c | |
| parent | 91d2d9664188336e93786a92761888d1e299c88f (diff) | |
| parent | 015408caf0806500740413126a0215c7493f4bdf (diff) | |
| download | illumos-joyent-cedddd0bb5c808632ca226e9f66ab136098d1b2c.tar.gz | |
[illumos-gate merge]
commit 015408caf0806500740413126a0215c7493f4bdf
7934 sa_init() should use multi-threaded errno
commit 25d3556849fcbe4fe5d517e1add48e0b2d585c70
7933 libcfgadm: memory leak in do_list_common()
commit 89ac1330de393e78c8b27c33453223b10d3c18da
7932 cfgadm_plugins/shp: memory leaks in cfga_list_ext()
commit 39b16bd33a2633978bee6aed53e3afeb26399eb4
7840 Define uint16_t member in in6_addr
commit e1508819051004d7be493a04ee515905ae412142
6899 coverity problems in localedef
commit 8241ccbb39665a24ebedcca509f82ef3f0b6dd83
6470 mac_unregister() needs to mod_hash_remove() BEFORE holding the perimeter.
commit 6e28b3a925501ed4b842fd8e877e8a89989a4c5c
7897 loader.efi: Use 32-bit value for .text padding, for linker portability
commit e3ed3d332db66cf933650481f47832aaadb70ec3
7862 libdisasm: left shift of negative value
commit a536a2a3182b56eef2630fb4b4509c9e106655e6
7722 bootblock versioning needs to deal with missing data
commit baa708d63390757ca1a97444649f2fe4d3ae98f0
7926 enable gcc warnings for sd
Conflicts:
usr/src/uts/common/io/scsi/targets/sd.c
Diffstat (limited to 'usr/src/lib/libshare/common/libshare.c')
| -rw-r--r-- | usr/src/lib/libshare/common/libshare.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/src/lib/libshare/common/libshare.c b/usr/src/lib/libshare/common/libshare.c index 320ff911d7..6950031978 100644 --- a/usr/src/lib/libshare/common/libshare.c +++ b/usr/src/lib/libshare/common/libshare.c @@ -44,6 +44,7 @@ #include <libintl.h> #include <thread.h> #include <synch.h> +#include <errno.h> #define DFS_LOCK_FILE "/etc/dfs/fstypes" #define SA_STRSIZE 256 /* max string size for names */ @@ -879,7 +880,6 @@ sa_init(int init_service) sablocksigs(&old); lockfd = open(DFS_LOCK_FILE, O_RDWR); if (lockfd >= 0) { - extern int errno; errno = 0; (void) lockf(lockfd, F_LOCK, 0); (void) mutex_lock(&sa_dfstab_lock); |