X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosd-zfs%2Fosd_internal.h;h=0e202d2b716672ffbe69299f9cc21a8a8d663002;hb=e84d60ea58e5d236a35eb128e73b6ca4c567373d;hp=d217a569f1fd9314af1af608fa403ba87d90080c;hpb=c330a759c70b8328a0821d6f314d61f39e1efe8c;p=fs%2Flustre-release.git

diff --git a/lustre/osd-zfs/osd_internal.h b/lustre/osd-zfs/osd_internal.h
index d217a56..0e202d2 100644
--- a/lustre/osd-zfs/osd_internal.h
+++ b/lustre/osd-zfs/osd_internal.h
@@ -104,7 +104,7 @@ struct osd_zap_it {
 	 * 3 - real records */
 	unsigned		 ozi_pos:3;
 	union {
-		char		 ozi_name[NAME_MAX + 1]; /* file name for dir */
+		char		 ozi_name[MAXNAMELEN]; /* file name for dir */
 		__u64		 ozi_key; /* binary key for index files */
 	};
 };
@@ -167,7 +167,10 @@ struct osd_thread_info {
 	};
 
 	char			 oti_str[64];
-	char			 oti_key[MAXNAMELEN + 1];
+	union {
+		char		 oti_key[MAXNAMELEN + 1];
+		__u64		 oti_key64[(MAXNAMELEN + 1)/sizeof(__u64)];
+	};
 	struct lustre_mdt_attrs oti_mdt_attrs;
 
 	struct lu_attr		 oti_la;
@@ -303,7 +306,9 @@ struct osd_object {
 	uint64_t		 oo_xattr;
 
 	/* record size for index file */
-	int			 oo_recsize;
+	unsigned char		 oo_keysize;
+	unsigned char		 oo_recsize;
+	unsigned char		 oo_recusize;	/* unit size */
 };
 
 int osd_statfs(const struct lu_env *, struct dt_device *, struct obd_statfs *);