Commit 875fef49 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ceph-for-5.4-rc8' of git://github.com/ceph/ceph-client 

Pull ceph fixes from Ilya Dryomov:
 "Two fixes for the buffered reads and O_DIRECT writes serialization
  patch that went into -rc1 and a fixup for a bogus warning on older gcc
  versions"

* tag 'ceph-for-5.4-rc8' of git://github.com/ceph/ceph-client:
  rbd: silence bogus uninitialized warning in rbd_object_map_update_finish()
  ceph: increment/decrement dio counter on async requests
  ceph: take the inode lock before acquiring cap refs
parents a28f239e 633739b2

drivers/block/rbd.c

+1 −1
Original line number Diff line number Diff line
@@ -2087,7 +2087,7 @@ static int rbd_object_map_update_finish(struct rbd_obj_request *obj_req, 
	struct rbd_device *rbd_dev = obj_req->img_request->rbd_dev;

	struct ceph_osd_data *osd_data;

	u64 objno;

	u8 state, new_state, current_state;

	u8 state, new_state, uninitialized_var(current_state);

	bool has_current_state;

	void *p;

fs/ceph/file.c

+22 −7
Original line number Diff line number Diff line
@@ -753,6 +753,9 @@ static void ceph_aio_complete(struct inode *inode, 
	if (!atomic_dec_and_test(&aio_req->pending_reqs))

		return;



	if (aio_req->iocb->ki_flags & IOCB_DIRECT)

		inode_dio_end(inode);



	ret = aio_req->error;

	if (!ret)

		ret = aio_req->total_len;
@@ -1091,6 +1094,7 @@ ceph_direct_read_write(struct kiocb *iocb, struct iov_iter *iter, 
					      CEPH_CAP_FILE_RD);



		list_splice(&aio_req->osd_reqs, &osd_reqs);

		inode_dio_begin(inode);

		while (!list_empty(&osd_reqs)) {

			req = list_first_entry(&osd_reqs,

					       struct ceph_osd_request,
@@ -1264,14 +1268,24 @@ again: 
	dout("aio_read %p %llx.%llx %llu~%u trying to get caps on %p\n",

	     inode, ceph_vinop(inode), iocb->ki_pos, (unsigned)len, inode);



	if (iocb->ki_flags & IOCB_DIRECT)

		ceph_start_io_direct(inode);

	else

		ceph_start_io_read(inode);



	if (fi->fmode & CEPH_FILE_MODE_LAZY)

		want = CEPH_CAP_FILE_CACHE | CEPH_CAP_FILE_LAZYIO;

	else

		want = CEPH_CAP_FILE_CACHE;

	ret = ceph_get_caps(filp, CEPH_CAP_FILE_RD, want, -1,

			    &got, &pinned_page);

	if (ret < 0)

	if (ret < 0) {

		if (iocb->ki_flags & IOCB_DIRECT)

			ceph_end_io_direct(inode);

		else

			ceph_end_io_read(inode);

		return ret;

	}



	if ((got & (CEPH_CAP_FILE_CACHE|CEPH_CAP_FILE_LAZYIO)) == 0 ||

	    (iocb->ki_flags & IOCB_DIRECT) ||
@@ -1283,16 +1297,12 @@ again: 


		if (ci->i_inline_version == CEPH_INLINE_NONE) {

			if (!retry_op && (iocb->ki_flags & IOCB_DIRECT)) {

				ceph_start_io_direct(inode);

				ret = ceph_direct_read_write(iocb, to,

							     NULL, NULL);

				ceph_end_io_direct(inode);

				if (ret >= 0 && ret < len)

					retry_op = CHECK_EOF;

			} else {

				ceph_start_io_read(inode);

				ret = ceph_sync_read(iocb, to, &retry_op);

				ceph_end_io_read(inode);

			}

		} else {

			retry_op = READ_INLINE;
@@ -1303,11 +1313,10 @@ again: 
		     inode, ceph_vinop(inode), iocb->ki_pos, (unsigned)len,

		     ceph_cap_string(got));

		ceph_add_rw_context(fi, &rw_ctx);

		ceph_start_io_read(inode);

		ret = generic_file_read_iter(iocb, to);

		ceph_end_io_read(inode);

		ceph_del_rw_context(fi, &rw_ctx);

	}



	dout("aio_read %p %llx.%llx dropping cap refs on %s = %d\n",

	     inode, ceph_vinop(inode), ceph_cap_string(got), (int)ret);

	if (pinned_page) {
@@ -1315,6 +1324,12 @@ again: 
		pinned_page = NULL;

	}

	ceph_put_cap_refs(ci, got);



	if (iocb->ki_flags & IOCB_DIRECT)

		ceph_end_io_direct(inode);

	else

		ceph_end_io_read(inode);



	if (retry_op > HAVE_RETRIED && ret >= 0) {

		int statret;

		struct page *page = NULL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE