Commit a25cedb4 authored by Jeff Layton's avatar Jeff Layton Committed by Ilya Dryomov
Browse files

ceph: switch netfs read ops to use rreq->inode instead of rreq->mapping->host 



One fewer pointer dereference, and in the future we may not be able to
count on the mapping pointer being populated (e.g. in the DIO case).

Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 7e57714c

fs/ceph/addr.c

+3 −3
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ static int ceph_releasepage(struct page *page, gfp_t gfp) 


static void ceph_netfs_expand_readahead(struct netfs_read_request *rreq)

{

	struct inode *inode = rreq->mapping->host;

	struct inode *inode = rreq->inode;

	struct ceph_inode_info *ci = ceph_inode(inode);

	struct ceph_file_layout *lo = &ci->i_layout;

	u32 blockoff;
@@ -202,7 +202,7 @@ static void ceph_netfs_expand_readahead(struct netfs_read_request *rreq) 


static bool ceph_netfs_clamp_length(struct netfs_read_subrequest *subreq)

{

	struct inode *inode = subreq->rreq->mapping->host;

	struct inode *inode = subreq->rreq->inode;

	struct ceph_fs_client *fsc = ceph_inode_to_client(inode);

	struct ceph_inode_info *ci = ceph_inode(inode);

	u64 objno, objoff;
@@ -248,7 +248,7 @@ static void finish_netfs_read(struct ceph_osd_request *req) 
static void ceph_netfs_issue_op(struct netfs_read_subrequest *subreq)

{

	struct netfs_read_request *rreq = subreq->rreq;

	struct inode *inode = rreq->mapping->host;

	struct inode *inode = rreq->inode;

	struct ceph_inode_info *ci = ceph_inode(inode);

	struct ceph_fs_client *fsc = ceph_inode_to_client(inode);

	struct ceph_osd_request *req;