smb: move get_rfc1002_len() to common/smbglob.h

Rename get_rfc1002_length() to get_rfc1002_len(), then move duplicate
definitions to common header file.

Co-developed-by: ChenXiaoSong <chenxiaosong@kylinos.cn>
Signed-off-by: ChenXiaoSong <chenxiaosong@kylinos.cn>
Signed-off-by: ZhangGuoDong <zhangguodong@kylinos.cn>
Acked-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>

diff --git a/fs/smb/client/cifsglob.h b/fs/smb/client/cifsglob.h
index accca43f7af54138d06339886063d923dd7f9626..4d0aca8097c111c2da7de85b5284f93279e2fb5a 100644 (file)
--- a/fs/smb/client/cifsglob.h
+++ b/fs/smb/client/cifsglob.h
@@ -670,12 +670,6 @@ struct cifs_mnt_data {
        int flags;
 };
 
-static inline unsigned int
-get_rfc1002_length(void *buf)
-{
-       return be32_to_cpu(*((__be32 *)buf)) & 0xffffff;
-}
-
 struct TCP_Server_Info {
        struct list_head tcp_ses_list;
        struct list_head smb_ses_list;

diff --git a/fs/smb/client/cifssmb.c b/fs/smb/client/cifssmb.c
index dcc50a2bfa4b239943771289ad2996e262d5bdef..132d015cbdf1bea9f165f039bfbc08128050c8a9 100644 (file)
--- a/fs/smb/client/cifssmb.c
+++ b/fs/smb/client/cifssmb.c
@@ -614,7 +614,7 @@ CIFSSMBEcho(struct TCP_Server_Info *server)
 
        iov[0].iov_len = 4;
        iov[0].iov_base = smb;
-       iov[1].iov_len = get_rfc1002_length(smb);
+       iov[1].iov_len = get_rfc1002_len(smb);
        iov[1].iov_base = (char *)smb + 4;
 
        rc = cifs_call_async(server, &rqst, NULL, cifs_echo_callback, NULL,
@@ -1458,7 +1458,7 @@ cifs_async_readv(struct cifs_io_subrequest *rdata)
        rdata->iov[0].iov_base = smb;
        rdata->iov[0].iov_len = 4;
        rdata->iov[1].iov_base = (char *)smb + 4;
-       rdata->iov[1].iov_len = get_rfc1002_length(smb);
+       rdata->iov[1].iov_len = get_rfc1002_len(smb);
 
        trace_smb3_read_enter(rdata->rreq->debug_id,
                              rdata->subreq.debug_index,
@@ -1830,7 +1830,7 @@ cifs_async_writev(struct cifs_io_subrequest *wdata)
        /* 4 for RFC1001 length + 1 for BCC */
        iov[0].iov_len = 4;
        iov[0].iov_base = smb;
-       iov[1].iov_len = get_rfc1002_length(smb) + 1;
+       iov[1].iov_len = get_rfc1002_len(smb) + 1;
        iov[1].iov_base = (char *)smb + 4;
 
        rqst.rq_iov = iov;

diff --git a/fs/smb/client/cifstransport.c b/fs/smb/client/cifstransport.c
index e98b95eff8c98344140c462e06b136747ea459bc..4c4f5befb6d3fde9e29b2bf49a32cedd08601052 100644 (file)
--- a/fs/smb/client/cifstransport.c
+++ b/fs/smb/client/cifstransport.c
@@ -165,7 +165,7 @@ SendReceiveNoRsp(const unsigned int xid, struct cifs_ses *ses,
        int resp_buf_type;
 
        iov[0].iov_base = in_buf;
-       iov[0].iov_len = get_rfc1002_length(in_buf) + 4;
+       iov[0].iov_len = get_rfc1002_len(in_buf) + 4;
        flags |= CIFS_NO_RSP_BUF;
        rc = SendReceive2(xid, ses, iov, 1, &resp_buf_type, flags, &rsp_iov);
        cifs_dbg(NOISY, "SendRcvNoRsp flags %d rc %d\n", flags, rc);
@@ -177,7 +177,7 @@ int
 cifs_check_receive(struct mid_q_entry *mid, struct TCP_Server_Info *server,
                   bool log_error)
 {
-       unsigned int len = get_rfc1002_length(mid->resp_buf) + 4;
+       unsigned int len = get_rfc1002_len(mid->resp_buf) + 4;
 
        dump_smb(mid->resp_buf, min_t(u32, 92, len));
 
@@ -370,7 +370,7 @@ SendReceive(const unsigned int xid, struct cifs_ses *ses,
                goto out;
        }
 
-       *pbytes_returned = get_rfc1002_length(midQ->resp_buf);
+       *pbytes_returned = get_rfc1002_len(midQ->resp_buf);
        memcpy(out_buf, midQ->resp_buf, *pbytes_returned + 4);
        rc = cifs_check_receive(midQ, server, 0);
 out:
@@ -554,7 +554,7 @@ SendReceiveBlockingLock(const unsigned int xid, struct cifs_tcon *tcon,
                goto out;
        }
 
-       *pbytes_returned = get_rfc1002_length(midQ->resp_buf);
+       *pbytes_returned = get_rfc1002_len(midQ->resp_buf);
        memcpy(out_buf, midQ->resp_buf, *pbytes_returned + 4);
        rc = cifs_check_receive(midQ, server, 0);
 out:

diff --git a/fs/smb/client/connect.c b/fs/smb/client/connect.c
index 2f94d93b95e916e80ddef042d34c5a133c8d08f2..ca4d6055d2f372af865c0d85806ecc17c7dc417a 100644 (file)
--- a/fs/smb/client/connect.c
+++ b/fs/smb/client/connect.c
@@ -1295,7 +1295,7 @@ cifs_demultiplex_thread(void *p)
                 * The right amount was read from socket - 4 bytes,
                 * so we can now interpret the length field.
                 */
-               pdu_length = get_rfc1002_length(buf);
+               pdu_length = get_rfc1002_len(buf);
 
                cifs_dbg(FYI, "RFC1002 header 0x%x\n", pdu_length);
                if (!is_smb_response(server, buf[0]))

diff --git a/fs/smb/common/smbglob.h b/fs/smb/common/smbglob.h
index 84aa6826c3eae530e992351047988f761b4b41f9..b258199b0d754a42bdd8374ea6afdee1d06dab21 100644 (file)
--- a/fs/smb/common/smbglob.h
+++ b/fs/smb/common/smbglob.h
@@ -40,6 +40,11 @@ struct smb_version_values {
        size_t          create_posix_size;
 };
 
+static inline unsigned int get_rfc1002_len(void *buf)
+{
+       return be32_to_cpu(*((__be32 *)buf)) & 0xffffff;
+}
+
 static inline void inc_rfc1001_len(void *buf, int count)
 {
        be32_add_cpu((__be32 *)buf, count);

diff --git a/fs/smb/server/smb_common.h b/fs/smb/server/smb_common.h
index 93f28defef3e216d8401e29ae1684d602a17e943..ff3e441da12578760cde520943b2dcf4cbaff294 100644 (file)
--- a/fs/smb/server/smb_common.h
+++ b/fs/smb/server/smb_common.h
@@ -423,9 +423,4 @@ unsigned int ksmbd_server_side_copy_max_chunk_size(void);
 unsigned int ksmbd_server_side_copy_max_total_size(void);
 bool is_asterisk(char *p);
 __le32 smb_map_generic_desired_access(__le32 daccess);
-
-static inline unsigned int get_rfc1002_len(void *buf)
-{
-       return be32_to_cpu(*((__be32 *)buf)) & 0xffffff;
-}
 #endif /* __SMB_COMMON_H__ */