1 files changed, 15 insertions, 5 deletions

diff --git a/cooker/call.c b/cooker/call.c
index dd37fe9..19a7b7e 100644
--- a/cooker/call.c
+++ b/cooker/call.c
@@ -72,11 +72,13 @@ static union value parse_metadata(struct gluten_ctx *g, struct field *f,
 		if (tag_offset.type == OFFSET_NULL)
 			die("   tag not found");
 
-		if ((*base_offset)->type == OFFSET_NULL || (f->flags & WBUF)) {
+		if (f->flags & FD) {
+			emit_fdget(g, tag_offset, offset);
+		} else if ((*base_offset)->type == OFFSET_NULL || (f->flags & WBUF)) {
 			**base_offset = tag_offset;
 		} else if (f->flags & MASK || add) {
-			emit_bitwise(g, f->type, BITWISE_OR, offset, offset,
-				     tag_offset);
+			emit_bitwise(g, f->type, NULL, BITWISE_OR,
+				     offset, offset, tag_offset);
 		} else {
 			emit_copy_field(g, f, offset, tag_offset);
 		}
@@ -335,6 +337,9 @@ bool arg_needs_temp(struct field *f, int pos, JSON_Value *jvalue,
 		if (json_object_get_string(tmp, "set"))
 			return true;
 
+		if (json_object_get_string(tmp, "get") && f->flags & FD)
+			return true;
+
 		if (level)
 			return true;
 
@@ -374,6 +379,7 @@ bool arg_needs_temp(struct field *f, int pos, JSON_Value *jvalue,
 
 		return false;
 	case FDPATH:
+	case FDMOUNT:
 	case STRING:
 		return false;
 	case STRUCT:
@@ -433,7 +439,8 @@ static void parse_call(struct gluten_ctx *g, struct context_desc *cdesc,
 	struct gluten_offset offset[6] = { 0 }, ret_offset = { 0 };
 	bool is_ptr[6] = { false };
 	/* Minimum requirements for argument specification:
-	 * - if argument can be FDPATH, exactly one value for that position
+	 * - if argument can be FDPATH/FDMOUNT, exactly one value for that
+	 *   position
 	 * - if argument is a size field, value is optional
 	 * - otherwise, every argument needs to be specified
 	 */
@@ -459,7 +466,7 @@ static void parse_call(struct gluten_ctx *g, struct context_desc *cdesc,
 			arg_check[a->pos].multi_field = true;
 		arg_check[a->pos].found = true;
 
-		if (a->f.type == FDPATH)
+		if (a->f.type == FDPATH || a->f.type == FDMOUNT)
 			arg_check[a->pos].needs_fd = true;
 
 		if (a->f.size)
@@ -599,6 +606,9 @@ void handle_calls(struct gluten_ctx *g, JSON_Value *value)
 		}
 
 		name = json_object_get_name(obj, n);
+		if (!name)
+			continue;
+
 		value = json_object_get_value_at(obj, n);
 		args = json_object_get_object(obj, name);