Commit b7ec35b3 authored by Ilya Dryomov's avatar Ilya Dryomov
Browse files

libceph: change ceph_osdmap_flag() to take osdc 



For the benefit of every single caller, take osdc instead of map.
Also, now that osdc->osdmap can't ever be NULL, drop the check.

Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 1a695a90

fs/ceph/file.c

+4 −4
Original line number Diff line number Diff line
@@ -1349,7 +1349,7 @@ static ssize_t ceph_write_iter(struct kiocb *iocb, struct iov_iter *from) 
	}



retry_snap:

	if (ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_FULL)) {

	if (ceph_osdmap_flag(osdc, CEPH_OSDMAP_FULL)) {

		err = -ENOSPC;

		goto out;

	}
@@ -1440,7 +1440,7 @@ static ssize_t ceph_write_iter(struct kiocb *iocb, struct iov_iter *from) 
	ceph_put_cap_refs(ci, got);



	if (written >= 0) {

		if (ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_NEARFULL))

		if (ceph_osdmap_flag(osdc, CEPH_OSDMAP_NEARFULL))

			iocb->ki_flags |= IOCB_DSYNC;



		written = generic_write_sync(iocb, written);
@@ -1672,7 +1672,7 @@ static long ceph_fallocate(struct file *file, int mode, 
		goto unlock;

	}



	if (ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_FULL) &&

	if (ceph_osdmap_flag(osdc, CEPH_OSDMAP_FULL) &&

	    !(mode & FALLOC_FL_PUNCH_HOLE)) {

		ret = -ENOSPC;

		goto unlock;

include/linux/ceph/osd_client.h

+5 −0
Original line number Diff line number Diff line
@@ -279,6 +279,11 @@ struct ceph_osd_client { 
	struct workqueue_struct	*notify_wq;

};



static inline bool ceph_osdmap_flag(struct ceph_osd_client *osdc, int flag)

{

	return osdc->osdmap->flags & flag;

}



extern int ceph_osdc_setup(void);

extern void ceph_osdc_cleanup(void);

include/linux/ceph/osdmap.h

+0 −5
Original line number Diff line number Diff line
@@ -189,11 +189,6 @@ static inline bool ceph_osd_is_down(struct ceph_osdmap *map, int osd) 
	return !ceph_osd_is_up(map, osd);

}



static inline bool ceph_osdmap_flag(struct ceph_osdmap *map, int flag)

{

	return map && (map->flags & flag);

}



extern char *ceph_osdmap_state_str(char *str, int len, int state);

extern u32 ceph_get_primary_affinity(struct ceph_osdmap *map, int osd);

net/ceph/osd_client.c

+19 −20
Original line number Diff line number Diff line
@@ -1276,9 +1276,9 @@ static bool target_should_be_paused(struct ceph_osd_client *osdc, 
				    const struct ceph_osd_request_target *t,

				    struct ceph_pg_pool_info *pi)

{

	bool pauserd = ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_PAUSERD);

	bool pausewr = ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_PAUSEWR) ||

		       ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_FULL) ||

	bool pauserd = ceph_osdmap_flag(osdc, CEPH_OSDMAP_PAUSERD);

	bool pausewr = ceph_osdmap_flag(osdc, CEPH_OSDMAP_PAUSEWR) ||

		       ceph_osdmap_flag(osdc, CEPH_OSDMAP_FULL) ||

		       __pool_full(pi);



	WARN_ON(pi->id != t->base_oloc.pool);
@@ -1303,8 +1303,7 @@ static enum calc_target_result calc_target(struct ceph_osd_client *osdc, 
	bool force_resend = false;

	bool need_check_tiering = false;

	bool need_resend = false;

	bool sort_bitwise = ceph_osdmap_flag(osdc->osdmap,

					     CEPH_OSDMAP_SORTBITWISE);

	bool sort_bitwise = ceph_osdmap_flag(osdc, CEPH_OSDMAP_SORTBITWISE);

	enum calc_target_result ct_res;

	int ret;
@@ -1590,9 +1589,9 @@ static void maybe_request_map(struct ceph_osd_client *osdc) 
	verify_osdc_locked(osdc);

	WARN_ON(!osdc->osdmap->epoch);



	if (ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_FULL) ||

	    ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_PAUSERD) ||

	    ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_PAUSEWR)) {

	if (ceph_osdmap_flag(osdc, CEPH_OSDMAP_FULL) ||

	    ceph_osdmap_flag(osdc, CEPH_OSDMAP_PAUSERD) ||

	    ceph_osdmap_flag(osdc, CEPH_OSDMAP_PAUSEWR)) {

		dout("%s osdc %p continuous\n", __func__, osdc);

		continuous = true;

	} else {
@@ -1629,19 +1628,19 @@ static void __submit_request(struct ceph_osd_request *req, bool wrlocked) 
	}



	if ((req->r_flags & CEPH_OSD_FLAG_WRITE) &&

	    ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_PAUSEWR)) {

	    ceph_osdmap_flag(osdc, CEPH_OSDMAP_PAUSEWR)) {

		dout("req %p pausewr\n", req);

		req->r_t.paused = true;

		maybe_request_map(osdc);

	} else if ((req->r_flags & CEPH_OSD_FLAG_READ) &&

		   ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_PAUSERD)) {

		   ceph_osdmap_flag(osdc, CEPH_OSDMAP_PAUSERD)) {

		dout("req %p pauserd\n", req);

		req->r_t.paused = true;

		maybe_request_map(osdc);

	} else if ((req->r_flags & CEPH_OSD_FLAG_WRITE) &&

		   !(req->r_flags & (CEPH_OSD_FLAG_FULL_TRY |

				     CEPH_OSD_FLAG_FULL_FORCE)) &&

		   (ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_FULL) ||

		   (ceph_osdmap_flag(osdc, CEPH_OSDMAP_FULL) ||

		    pool_full(osdc, req->r_t.base_oloc.pool))) {

		dout("req %p full/pool_full\n", req);

		pr_warn_ratelimited("FULL or reached pool quota\n");
@@ -2280,7 +2279,7 @@ static void send_linger_ping(struct ceph_osd_linger_request *lreq) 
	struct ceph_osd_request *req = lreq->ping_req;

	struct ceph_osd_req_op *op = &req->r_ops[0];



	if (ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_PAUSERD)) {

	if (ceph_osdmap_flag(osdc, CEPH_OSDMAP_PAUSERD)) {

		dout("%s PAUSERD\n", __func__);

		return;

	}
@@ -3050,7 +3049,7 @@ static int handle_one_map(struct ceph_osd_client *osdc, 
	bool skipped_map = false;

	bool was_full;



	was_full = ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_FULL);

	was_full = ceph_osdmap_flag(osdc, CEPH_OSDMAP_FULL);

	set_pool_was_full(osdc);



	if (incremental)
@@ -3088,7 +3087,7 @@ static int handle_one_map(struct ceph_osd_client *osdc, 
		osdc->osdmap = newmap;

	}



	was_full &= !ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_FULL);

	was_full &= !ceph_osdmap_flag(osdc, CEPH_OSDMAP_FULL);

	scan_requests(&osdc->homeless_osd, skipped_map, was_full, true,

		      need_resend, need_resend_linger);
@@ -3174,9 +3173,9 @@ void ceph_osdc_handle_map(struct ceph_osd_client *osdc, struct ceph_msg *msg) 
	if (ceph_check_fsid(osdc->client, &fsid) < 0)

		goto bad;



	was_pauserd = ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_PAUSERD);

	was_pausewr = ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_PAUSEWR) ||

		      ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_FULL) ||

	was_pauserd = ceph_osdmap_flag(osdc, CEPH_OSDMAP_PAUSERD);

	was_pausewr = ceph_osdmap_flag(osdc, CEPH_OSDMAP_PAUSEWR) ||

		      ceph_osdmap_flag(osdc, CEPH_OSDMAP_FULL) ||

		      have_pool_full(osdc);



	/* incremental maps */
@@ -3238,9 +3237,9 @@ void ceph_osdc_handle_map(struct ceph_osd_client *osdc, struct ceph_msg *msg) 
	 * we find out when we are no longer full and stop returning

	 * ENOSPC.

	 */

	pauserd = ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_PAUSERD);

	pausewr = ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_PAUSEWR) ||

		  ceph_osdmap_flag(osdc->osdmap, CEPH_OSDMAP_FULL) ||

	pauserd = ceph_osdmap_flag(osdc, CEPH_OSDMAP_PAUSERD);

	pausewr = ceph_osdmap_flag(osdc, CEPH_OSDMAP_PAUSEWR) ||

		  ceph_osdmap_flag(osdc, CEPH_OSDMAP_FULL) ||

		  have_pool_full(osdc);

	if (was_pauserd || was_pausewr || pauserd || pausewr)

		maybe_request_map(osdc);