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

ceph: clean up inode work queueing 



Add a generic function for taking an inode reference, setting the I_WORK
bit and queueing i_work. Turn the ceph_queue_* functions into static
inline wrappers that pass in the right bit.

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

fs/ceph/inode.c

+6 −49
Original line number Diff line number Diff line
@@ -1816,60 +1816,17 @@ void ceph_async_iput(struct inode *inode) 
	}

}



/*

 * Write back inode data in a worker thread.  (This can't be done

 * in the message handler context.)

 */

void ceph_queue_writeback(struct inode *inode)

{

	struct ceph_inode_info *ci = ceph_inode(inode);

	set_bit(CEPH_I_WORK_WRITEBACK, &ci->i_work_mask);



	ihold(inode);

	if (queue_work(ceph_inode_to_client(inode)->inode_wq,

		       &ci->i_work)) {

		dout("ceph_queue_writeback %p\n", inode);

	} else {

		dout("ceph_queue_writeback %p already queued, mask=%lx\n",

		     inode, ci->i_work_mask);

		iput(inode);

	}

}



/*

 * queue an async invalidation

 */

void ceph_queue_invalidate(struct inode *inode)

{

	struct ceph_inode_info *ci = ceph_inode(inode);

	set_bit(CEPH_I_WORK_INVALIDATE_PAGES, &ci->i_work_mask);



	ihold(inode);

	if (queue_work(ceph_inode_to_client(inode)->inode_wq,

		       &ceph_inode(inode)->i_work)) {

		dout("ceph_queue_invalidate %p\n", inode);

	} else {

		dout("ceph_queue_invalidate %p already queued, mask=%lx\n",

		     inode, ci->i_work_mask);

		iput(inode);

	}

}



/*

 * Queue an async vmtruncate.  If we fail to queue work, we will handle

 * the truncation the next time we call __ceph_do_pending_vmtruncate.

 */

void ceph_queue_vmtruncate(struct inode *inode)

void ceph_queue_inode_work(struct inode *inode, int work_bit)

{

	struct ceph_fs_client *fsc = ceph_inode_to_client(inode);

	struct ceph_inode_info *ci = ceph_inode(inode);

	set_bit(CEPH_I_WORK_VMTRUNCATE, &ci->i_work_mask);

	set_bit(work_bit, &ci->i_work_mask);



	ihold(inode);

	if (queue_work(ceph_inode_to_client(inode)->inode_wq,

		       &ci->i_work)) {

		dout("ceph_queue_vmtruncate %p\n", inode);

	if (queue_work(fsc->inode_wq, &ci->i_work)) {

		dout("queue_inode_work %p, mask=%lx\n", inode, ci->i_work_mask);

	} else {

		dout("ceph_queue_vmtruncate %p already queued, mask=%lx\n",

		dout("queue_inode_work %p already queued, mask=%lx\n",

		     inode, ci->i_work_mask);

		iput(inode);

	}

fs/ceph/super.h

+18 −3
Original line number Diff line number Diff line
@@ -962,11 +962,26 @@ extern int ceph_inode_holds_cap(struct inode *inode, int mask); 


extern bool ceph_inode_set_size(struct inode *inode, loff_t size);

extern void __ceph_do_pending_vmtruncate(struct inode *inode);

extern void ceph_queue_vmtruncate(struct inode *inode);

extern void ceph_queue_invalidate(struct inode *inode);

extern void ceph_queue_writeback(struct inode *inode);



extern void ceph_async_iput(struct inode *inode);



void ceph_queue_inode_work(struct inode *inode, int work_bit);



static inline void ceph_queue_vmtruncate(struct inode *inode)

{

	ceph_queue_inode_work(inode, CEPH_I_WORK_VMTRUNCATE);

}



static inline void ceph_queue_invalidate(struct inode *inode)

{

	ceph_queue_inode_work(inode, CEPH_I_WORK_INVALIDATE_PAGES);

}



static inline void ceph_queue_writeback(struct inode *inode)

{

	ceph_queue_inode_work(inode, CEPH_I_WORK_WRITEBACK);

}



extern int __ceph_do_getattr(struct inode *inode, struct page *locked_page,

			     int mask, bool force);

static inline int ceph_do_getattr(struct inode *inode, int mask, bool force)