From 2e8af978d9bb7ec3719dadc7c97014a287dec388 Mon Sep 17 00:00:00 2001 From: Aurelien Aptel Date: Sat, 8 Feb 2020 15:50:56 +0100 Subject: cifs: rename posix create rsp little progress on the posix create response. * rename struct to create_posix_rsp to match with the request create_posix context * make struct packed * pass smb info struct for parse_posix_ctxt to fill * use smb info struct as param * update TODO What needs to be done: SMB2_open() has an optional smb info out argument that it will fill. Callers making use of this are: - smb3_query_mf_symlink (need to investigate) - smb2_open_file Callers of smb2_open_file (via server->ops->open) are passing an smbinfo struct but that struct cannot hold POSIX information. All the call stack needs to be changed for a different info type. Maybe pass SMB generic struct like cifs_fattr instead. Signed-off-by: Aurelien Aptel Signed-off-by: Steve French --- fs/cifs/smb2pdu.c | 13 +++++++++---- fs/cifs/smb2pdu.h | 9 ++++++--- 2 files changed, 15 insertions(+), 7 deletions(-) (limited to 'fs/cifs') diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index 0f4cc8606cbc..ab31d6f54221 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c @@ -1951,13 +1951,18 @@ parse_query_id_ctxt(struct create_context *cc, struct smb2_file_all_info *buf) } static void -parse_posix_ctxt(struct create_context *cc, struct smb_posix_info *pposix_inf) +parse_posix_ctxt(struct create_context *cc, struct smb2_file_all_info *info) { - /* struct smb_posix_info *ppinf = (struct smb_posix_info *)cc; */ + /* struct create_posix_rsp *posix = (struct create_posix_rsp *)cc; */ - /* TODO: Need to add parsing for the context and return */ + /* + * TODO: Need to add parsing for the context and return. Can + * smb2_file_all_info hold POSIX data? Need to change the + * passed type from SMB2_open. + */ printk_once(KERN_WARNING "SMB3 3.11 POSIX response context not completed yet\n"); + } void @@ -1995,7 +2000,7 @@ smb2_parse_contexts(struct TCP_Server_Info *server, parse_query_id_ctxt(cc, buf); else if ((le16_to_cpu(cc->NameLength) == 16)) { if (memcmp(name, smb3_create_tag_posix, 16) == 0) - parse_posix_ctxt(cc, NULL); + parse_posix_ctxt(cc, buf); } /* else { cifs_dbg(FYI, "Context not matched with len %d\n", diff --git a/fs/cifs/smb2pdu.h b/fs/cifs/smb2pdu.h index fa03df130f1a..3addecebc25d 100644 --- a/fs/cifs/smb2pdu.h +++ b/fs/cifs/smb2pdu.h @@ -1604,11 +1604,14 @@ struct smb2_file_id_information { extern char smb2_padding[7]; /* equivalent of the contents of SMB3.1.1 POSIX open context response */ -struct smb_posix_info { +struct create_posix_rsp { __le32 nlink; __le32 reparse_tag; __le32 mode; - kuid_t uid; - kuid_t gid; + /* + * var sized owner SID + * var sized group SID + */ +} __packed; }; #endif /* _SMB2PDU_H */ -- cgit