diff --git a/utils/src/format.h b/utils/src/format.h
index 9b9fd06d..d801c40d 100644
--- a/utils/src/format.h
+++ b/utils/src/format.h
@@ -611,11 +611,11 @@ enum {
 
 #define SCOUTFS_XATTR_MAX_NAME_LEN	255
 #define SCOUTFS_XATTR_MAX_VAL_LEN	65535
-#define SCOUTFS_XATTR_MAX_PART_SIZE	512U
+#define SCOUTFS_XATTR_MAX_PART_SIZE	SCOUTFS_MAX_VAL_SIZE
 
 #define SCOUTFS_XATTR_NR_PARTS(name_len, val_len)			\
 	DIV_ROUND_UP(sizeof(struct scoutfs_xattr) + name_len + val_len, \
-		     SCOUTFS_XATTR_MAX_PART_SIZE);
+		     (unsigned int)SCOUTFS_XATTR_MAX_PART_SIZE)
 
 #define SCOUTFS_LOCK_INODE_GROUP_NR	1024
 #define SCOUTFS_LOCK_INODE_GROUP_MASK	(SCOUTFS_LOCK_INODE_GROUP_NR - 1)