Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57a929a6 authored by Long Li's avatar Long Li Committed by Steve French
Browse files

CIFS: Introduce offset for the 1st page in data transfer structures 



When direct I/O is used, the data buffer may not always align to page
boundaries. Introduce a page offset in transport data structures to
describe the location of the buffer within the page.

Also change the function to pass the page offset when sending data to
transport.

Signed-off-by: default avatarLong Li <longli@microsoft.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent eccb4422

fs/cifs/cifsglob.h

+3 −0
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ struct smb_rqst { 
	struct kvec	*rq_iov;	/* array of kvecs */

	unsigned int	rq_nvec;	/* number of kvecs in array */

	struct page	**rq_pages;	/* pointer to array of page ptrs */

	unsigned int	rq_offset;	/* the offset to the 1st page */

	unsigned int	rq_npages;	/* number pages in array */

	unsigned int	rq_pagesz;	/* page size to use */

	unsigned int	rq_tailsz;	/* length of last page */
@@ -1174,6 +1175,7 @@ struct cifs_readdata { 
	struct smbd_mr			*mr;

#endif

	unsigned int			pagesz;

	unsigned int			page_offset;

	unsigned int			tailsz;

	unsigned int			credits;

	unsigned int			nr_pages;
@@ -1199,6 +1201,7 @@ struct cifs_writedata { 
	struct smbd_mr			*mr;

#endif

	unsigned int			pagesz;

	unsigned int			page_offset;

	unsigned int			tailsz;

	unsigned int			credits;

	unsigned int			nr_pages;

fs/cifs/smb2pdu.c

+1 −0
Original line number Diff line number Diff line
@@ -3045,6 +3045,7 @@ smb2_async_writev(struct cifs_writedata *wdata, 
	rqst.rq_iov = iov;

	rqst.rq_nvec = 2;

	rqst.rq_pages = wdata->pages;

	rqst.rq_offset = wdata->page_offset;

	rqst.rq_npages = wdata->nr_pages;

	rqst.rq_pagesz = wdata->pagesz;

	rqst.rq_tailsz = wdata->tailsz;