Page MenuHomeFreeBSD
Files F109871625

D36135.id109501.diff
No OneTemporary
Actions

D36135.id109501.diff
View Options

diff --git a/usr.sbin/makefs/zfs/dsl.c b/usr.sbin/makefs/zfs/dsl.c
--- a/usr.sbin/makefs/zfs/dsl.c
+++ b/usr.sbin/makefs/zfs/dsl.c
@@ -29,6 +29,7 @@
*/
#include <assert.h>
+#include <stdlib.h>
#include <string.h>
#include <util.h>
diff --git a/usr.sbin/makefs/zfs/fs.c b/usr.sbin/makefs/zfs/fs.c
--- a/usr.sbin/makefs/zfs/fs.c
+++ b/usr.sbin/makefs/zfs/fs.c
@@ -28,11 +28,12 @@
* SUCH DAMAGE.
*/
-#include <sys/dirent.h>
#include <sys/stat.h>
#include <assert.h>
+#include <dirent.h>
#include <fcntl.h>
+#include <stdlib.h>
#include <string.h>
#include <unistd.h>
@@ -456,7 +457,12 @@
fs_populate_time(fs, attrbuf, &sb->st_mtim, ZPL_ATIME, &bonussz);
fs_populate_time(fs, attrbuf, &sb->st_ctim, ZPL_CTIME, &bonussz);
fs_populate_time(fs, attrbuf, &sb->st_mtim, ZPL_MTIME, &bonussz);
+#ifdef __linux__
+ /* Linux has no st_birthtim; approximate with st_ctim */
+ fs_populate_time(fs, attrbuf, &sb->st_ctim, ZPL_CRTIME, &bonussz);
+#else
fs_populate_time(fs, attrbuf, &sb->st_birthtim, ZPL_CRTIME, &bonussz);
+#endif
fs_populate_varszattr(fs, attrbuf, aces, sizeof(aces), 0,
ZPL_DACL_ACES, &bonussz);
diff --git a/usr.sbin/makefs/zfs/objset.c b/usr.sbin/makefs/zfs/objset.c
--- a/usr.sbin/makefs/zfs/objset.c
+++ b/usr.sbin/makefs/zfs/objset.c
@@ -29,6 +29,7 @@
*/
#include <assert.h>
+#include <stdlib.h>
#include <string.h>
#include <util.h>
diff --git a/usr.sbin/makefs/zfs/vdev.c b/usr.sbin/makefs/zfs/vdev.c
--- a/usr.sbin/makefs/zfs/vdev.c
+++ b/usr.sbin/makefs/zfs/vdev.c
@@ -30,6 +30,7 @@
#include <assert.h>
#include <fcntl.h>
+#include <stdlib.h>
#include <string.h>
#include <unistd.h>
diff --git a/usr.sbin/makefs/zfs/zap.c b/usr.sbin/makefs/zfs/zap.c
--- a/usr.sbin/makefs/zfs/zap.c
+++ b/usr.sbin/makefs/zfs/zap.c
@@ -33,6 +33,7 @@
#include <assert.h>
#include <stddef.h>
+#include <stdlib.h>
#include <string.h>
#include <util.h>
diff --git a/usr.sbin/makefs/zfs/zfs.h b/usr.sbin/makefs/zfs/zfs.h
--- a/usr.sbin/makefs/zfs/zfs.h
+++ b/usr.sbin/makefs/zfs/zfs.h
@@ -32,6 +32,7 @@
#define _MAKEFS_ZFS_H_
#include <sys/types.h>
+#include <sys/endian.h>
#include <sys/queue.h>
#include <bitstring.h>

File Metadata

Mime Type
text/plain
Expires
Tue, Feb 11, 2:26 PM (7 h, 4 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16596313
Default Alt Text
D36135.id109501.diff (2 KB)

Event Timeline