From: Jule Anger <janger@samba.org>
Date: Mon, 1 Aug 2022 09:15:44 +0000 (+0200)
Subject: smbstatus: add file_id information to byte-range locks in json output
X-Git-Tag: samba-4.17.0rc1~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fed1569f03cb2e8d5cea81074c3e076badbe51a0;p=thirdparty%2Fsamba.git

smbstatus: add file_id information to byte-range locks in json output

Adds a dictionary with file_id information (devid, inode and extid) for
each byte-range locked file.

Signed-off-by: Jule Anger <janger@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/source3/utils/status.c b/source3/utils/status.c
index f02e8e14951..6aad917d075 100644
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -412,6 +412,7 @@ static void print_brl(struct file_id id,
 	} else {
 		print_brl_json(state,
 			       pid,
+			       id,
 			       desc,
 			       lock_flav,
 			       (intmax_t)start,
diff --git a/source3/utils/status_json.c b/source3/utils/status_json.c
index 71783916004..695bfd0a21c 100644
--- a/source3/utils/status_json.c
+++ b/source3/utils/status_json.c
@@ -1035,6 +1035,7 @@ failure:
 
 int print_brl_json(struct traverse_state *state,
 		   const struct server_id server_id,
+		   struct file_id fid,
 		   const char *type,
 		   enum brl_flavour flavour,
 		   intmax_t start,
@@ -1070,6 +1071,10 @@ int print_brl_json(struct traverse_state *state,
 		goto failure;
 	}
 
+	result = add_fileid_to_json(&file_json, fid);
+	if (result < 0) {
+		goto failure;
+	}
 	result = json_add_string(&file_json, "file_name", filename);
 	if (result < 0) {
 		goto failure;
diff --git a/source3/utils/status_json.h b/source3/utils/status_json.h
index 61e7b6a0540..70087a3f65d 100644
--- a/source3/utils/status_json.h
+++ b/source3/utils/status_json.h
@@ -55,6 +55,7 @@ int print_share_mode_json(struct traverse_state *state,
 
 int print_brl_json(struct traverse_state *state,
 		   const struct server_id server_id,
+		   struct file_id fid,
 		   const char *type,
 		   enum brl_flavour flavour,
 		   intmax_t start,
diff --git a/source3/utils/status_json_dummy.c b/source3/utils/status_json_dummy.c
index c657e55b44f..8923c41aac4 100644
--- a/source3/utils/status_json_dummy.c
+++ b/source3/utils/status_json_dummy.c
@@ -72,6 +72,7 @@ int print_share_mode_json(struct traverse_state *state,
 
 int print_brl_json(struct traverse_state *state,
 		   const struct server_id server_id,
+		   struct file_id fid,
 		   const char *type,
 		   enum brl_flavour flavour,
 		   intmax_t start,