OS-3453 lxbrand fix 64bit statfs

TritonDataCenter · Oct 23, 2014 · 429a0d6 · 429a0d6
1 parent 84b2471
commit 429a0d6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/usr/src/lib/brand/lx/lx_brand/common/lx_brand.c b/usr/src/lib/brand/lx/lx_brand/common/lx_brand.c
@@ -1253,8 +1253,8 @@ static struct lx_sysent sysents[] = {
 	{"uselib",	NULL,			NOSYS_KERNEL,	0}, /* 134 */
 	{"personality",	lx_personality,		0,		1}, /* 135 */
 	{"ustat",	NULL,			NOSYS_OBSOLETE,	2}, /* 136 */
-	{"statfs",	lx_statfs64,		0,		2}, /* 137 */
-	{"fstatfs",	lx_fstatfs64,		0,		2}, /* 138 */
+	{"statfs",	lx_statfs,		0,		2}, /* 137 */
+	{"fstatfs",	lx_fstatfs,		0,		2}, /* 138 */
 	{"sysfs",	lx_sysfs, 		0,		3}, /* 139 */
 	{"getpriority",	lx_getpriority,		0,		2}, /* 140 */
 	{"setpriority",	lx_setpriority,		0,		3}, /* 141 */

diff --git a/usr/src/lib/brand/lx/lx_brand/common/statfs.c b/usr/src/lib/brand/lx/lx_brand/common/statfs.c
@@ -226,7 +226,7 @@ lx_statfs(uintptr_t p1, uintptr_t p2)
 	struct statvfs vfs;
 	int err;
 
-	lx_debug("\tfstatvfs(%s, 0x%p)", path, fs);
+	lx_debug("\tstatvfs(%s, 0x%p)", path, fs);
 	if (statvfs(path, &vfs) != 0)
 		return (-errno);
 

diff --git a/usr/src/lib/brand/lx/lx_brand/sys/lx_statfs.h b/usr/src/lib/brand/lx/lx_brand/sys/lx_statfs.h
@@ -34,17 +34,17 @@ extern "C" {
 extern int lx_statfs_init(void);
 
 struct lx_statfs {
-	int		f_type;
-	int		f_bsize;
+	size_t		f_type;
+	size_t		f_bsize;
 	ulong_t		f_blocks;
 	ulong_t		f_bfree;
 	ulong_t		f_bavail;
 	ulong_t		f_files;
 	ulong_t		f_ffree;
 	u_longlong_t	f_fsid;
-	int		f_namelen;
-	int		f_frsize;
-	int		f_spare[5];
+	size_t		f_namelen;
+	size_t		f_frsize;
+	size_t		f_spare[5];
 };
 
 struct lx_statfs64 {