Skip to content

Commit 56c0bea

Browse files
paliSteve French
authored andcommitted
cifs: Split parse_reparse_point callback to functions: get buffer and parse buffer
Parsing reparse point buffer is generic for all SMB versions and is already implemented by global function parse_reparse_point(). Getting reparse point buffer from the SMB response is SMB version specific, so introduce for it a new callback get_reparse_point_buffer. This functionality split is needed for followup change - getting reparse point buffer without parsing it. Signed-off-by: Pali Rohár <pali@kernel.org> Signed-off-by: Steve French <stfrench@microsoft.com>
1 parent 12193b9 commit 56c0bea

File tree

6 files changed

+25
-37
lines changed

6 files changed

+25
-37
lines changed

fs/smb/client/cifsglob.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -625,10 +625,8 @@ struct smb_version_operations {
625625
bool (*is_status_io_timeout)(char *buf);
626626
/* Check for STATUS_NETWORK_NAME_DELETED */
627627
bool (*is_network_name_deleted)(char *buf, struct TCP_Server_Info *srv);
628-
int (*parse_reparse_point)(struct cifs_sb_info *cifs_sb,
629-
const char *full_path,
630-
struct kvec *rsp_iov,
631-
struct cifs_open_info_data *data);
628+
struct reparse_data_buffer * (*get_reparse_point_buffer)(const struct kvec *rsp_iov,
629+
u32 *plen);
632630
int (*create_reparse_symlink)(const unsigned int xid,
633631
struct inode *inode,
634632
struct dentry *dentry,

fs/smb/client/inode.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1207,10 +1207,13 @@ static int reparse_info_to_fattr(struct cifs_open_info_data *data,
12071207
/* Check for cached reparse point data */
12081208
if (data->symlink_target || data->reparse.buf) {
12091209
rc = 0;
1210-
} else if (iov && server->ops->parse_reparse_point) {
1211-
rc = server->ops->parse_reparse_point(cifs_sb,
1212-
full_path,
1213-
iov, data);
1210+
} else if (iov && server->ops->get_reparse_point_buffer) {
1211+
struct reparse_data_buffer *reparse_buf;
1212+
u32 reparse_len;
1213+
1214+
reparse_buf = server->ops->get_reparse_point_buffer(iov, &reparse_len);
1215+
rc = parse_reparse_point(reparse_buf, reparse_len,
1216+
cifs_sb, full_path, data);
12141217
/*
12151218
* If the reparse point was not handled but it is the
12161219
* name surrogate which points to directory, then treat

fs/smb/client/reparse.c

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1099,18 +1099,13 @@ int parse_reparse_point(struct reparse_data_buffer *buf,
10991099
}
11001100
}
11011101

1102-
int smb2_parse_reparse_point(struct cifs_sb_info *cifs_sb,
1103-
const char *full_path,
1104-
struct kvec *rsp_iov,
1105-
struct cifs_open_info_data *data)
1102+
struct reparse_data_buffer *smb2_get_reparse_point_buffer(const struct kvec *rsp_iov,
1103+
u32 *plen)
11061104
{
1107-
struct reparse_data_buffer *buf;
11081105
struct smb2_ioctl_rsp *io = rsp_iov->iov_base;
1109-
u32 plen = le32_to_cpu(io->OutputCount);
1110-
1111-
buf = (struct reparse_data_buffer *)((u8 *)io +
1112-
le32_to_cpu(io->OutputOffset));
1113-
return parse_reparse_point(buf, plen, cifs_sb, full_path, data);
1106+
*plen = le32_to_cpu(io->OutputCount);
1107+
return (struct reparse_data_buffer *)((u8 *)io +
1108+
le32_to_cpu(io->OutputOffset));
11141109
}
11151110

11161111
static bool wsl_to_fattr(struct cifs_open_info_data *data,

fs/smb/client/reparse.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,6 @@ int smb2_create_reparse_symlink(const unsigned int xid, struct inode *inode,
135135
int smb2_mknod_reparse(unsigned int xid, struct inode *inode,
136136
struct dentry *dentry, struct cifs_tcon *tcon,
137137
const char *full_path, umode_t mode, dev_t dev);
138-
int smb2_parse_reparse_point(struct cifs_sb_info *cifs_sb,
139-
const char *full_path,
140-
struct kvec *rsp_iov,
141-
struct cifs_open_info_data *data);
138+
struct reparse_data_buffer *smb2_get_reparse_point_buffer(const struct kvec *rsp_iov, u32 *len);
142139

143140
#endif /* _CIFS_REPARSE_H */

fs/smb/client/smb1ops.c

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -970,18 +970,13 @@ static int cifs_query_symlink(const unsigned int xid,
970970
return rc;
971971
}
972972

973-
static int cifs_parse_reparse_point(struct cifs_sb_info *cifs_sb,
974-
const char *full_path,
975-
struct kvec *rsp_iov,
976-
struct cifs_open_info_data *data)
973+
static struct reparse_data_buffer *cifs_get_reparse_point_buffer(const struct kvec *rsp_iov,
974+
u32 *plen)
977975
{
978-
struct reparse_data_buffer *buf;
979976
TRANSACT_IOCTL_RSP *io = rsp_iov->iov_base;
980-
u32 plen = le16_to_cpu(io->ByteCount);
981-
982-
buf = (struct reparse_data_buffer *)((__u8 *)&io->hdr.Protocol +
983-
le32_to_cpu(io->DataOffset));
984-
return parse_reparse_point(buf, plen, cifs_sb, full_path, data);
977+
*plen = le16_to_cpu(io->ByteCount);
978+
return (struct reparse_data_buffer *)((__u8 *)&io->hdr.Protocol +
979+
le32_to_cpu(io->DataOffset));
985980
}
986981

987982
static bool
@@ -1157,7 +1152,7 @@ struct smb_version_operations smb1_operations = {
11571152
.rename = CIFSSMBRename,
11581153
.create_hardlink = CIFSCreateHardLink,
11591154
.query_symlink = cifs_query_symlink,
1160-
.parse_reparse_point = cifs_parse_reparse_point,
1155+
.get_reparse_point_buffer = cifs_get_reparse_point_buffer,
11611156
.open = cifs_open_file,
11621157
.set_fid = cifs_set_fid,
11631158
.close = cifs_close_file,

fs/smb/client/smb2ops.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5303,7 +5303,7 @@ struct smb_version_operations smb20_operations = {
53035303
.unlink = smb2_unlink,
53045304
.rename = smb2_rename_path,
53055305
.create_hardlink = smb2_create_hardlink,
5306-
.parse_reparse_point = smb2_parse_reparse_point,
5306+
.get_reparse_point_buffer = smb2_get_reparse_point_buffer,
53075307
.query_mf_symlink = smb3_query_mf_symlink,
53085308
.create_mf_symlink = smb3_create_mf_symlink,
53095309
.create_reparse_symlink = smb2_create_reparse_symlink,
@@ -5406,7 +5406,7 @@ struct smb_version_operations smb21_operations = {
54065406
.unlink = smb2_unlink,
54075407
.rename = smb2_rename_path,
54085408
.create_hardlink = smb2_create_hardlink,
5409-
.parse_reparse_point = smb2_parse_reparse_point,
5409+
.get_reparse_point_buffer = smb2_get_reparse_point_buffer,
54105410
.query_mf_symlink = smb3_query_mf_symlink,
54115411
.create_mf_symlink = smb3_create_mf_symlink,
54125412
.create_reparse_symlink = smb2_create_reparse_symlink,
@@ -5513,7 +5513,7 @@ struct smb_version_operations smb30_operations = {
55135513
.unlink = smb2_unlink,
55145514
.rename = smb2_rename_path,
55155515
.create_hardlink = smb2_create_hardlink,
5516-
.parse_reparse_point = smb2_parse_reparse_point,
5516+
.get_reparse_point_buffer = smb2_get_reparse_point_buffer,
55175517
.query_mf_symlink = smb3_query_mf_symlink,
55185518
.create_mf_symlink = smb3_create_mf_symlink,
55195519
.create_reparse_symlink = smb2_create_reparse_symlink,
@@ -5629,7 +5629,7 @@ struct smb_version_operations smb311_operations = {
56295629
.unlink = smb2_unlink,
56305630
.rename = smb2_rename_path,
56315631
.create_hardlink = smb2_create_hardlink,
5632-
.parse_reparse_point = smb2_parse_reparse_point,
5632+
.get_reparse_point_buffer = smb2_get_reparse_point_buffer,
56335633
.query_mf_symlink = smb3_query_mf_symlink,
56345634
.create_mf_symlink = smb3_create_mf_symlink,
56355635
.create_reparse_symlink = smb2_create_reparse_symlink,

0 commit comments

Comments
 (0)