Commit f0139aa8 authored by Miklos Szeredi's avatar Miklos Szeredi
Browse files

fuse: fold fuse_request_send_nowait() into single caller 



And the same with fuse_request_send_nowait_locked().

Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
Reviewed-by: default avatarAshish Samant <ashish.samant@oracle.com>
parent de155226

fs/fuse/dev.c

+10 −22
Original line number Diff line number Diff line
@@ -590,7 +590,12 @@ ssize_t fuse_simple_request(struct fuse_conn *fc, struct fuse_args *args) 
	return ret;

}



static void fuse_request_send_nowait_locked(struct fuse_conn *fc,

/*

 * Called under fc->lock

 *

 * fc->connected must have been checked previously

 */

void fuse_request_send_background_locked(struct fuse_conn *fc,

					 struct fuse_req *req)

{

	BUG_ON(!req->background);
@@ -598,6 +603,7 @@ static void fuse_request_send_nowait_locked(struct fuse_conn *fc, 
		req->waiting = 1;

		atomic_inc(&fc->num_waiting);

	}

	req->isreply = 1;

	fc->num_background++;

	if (fc->num_background == fc->max_background)

		fc->blocked = 1;
@@ -610,12 +616,12 @@ static void fuse_request_send_nowait_locked(struct fuse_conn *fc, 
	flush_bg_queue(fc);

}



static void fuse_request_send_nowait(struct fuse_conn *fc, struct fuse_req *req)

void fuse_request_send_background(struct fuse_conn *fc, struct fuse_req *req)

{

	BUG_ON(!req->end);

	spin_lock(&fc->lock);

	if (fc->connected) {

		fuse_request_send_nowait_locked(fc, req);

		fuse_request_send_background_locked(fc, req);

		spin_unlock(&fc->lock);

	} else {

		spin_unlock(&fc->lock);
@@ -624,12 +630,6 @@ static void fuse_request_send_nowait(struct fuse_conn *fc, struct fuse_req *req) 
		fuse_put_request(fc, req);

	}

}



void fuse_request_send_background(struct fuse_conn *fc, struct fuse_req *req)

{

	req->isreply = 1;

	fuse_request_send_nowait(fc, req);

}

EXPORT_SYMBOL_GPL(fuse_request_send_background);



static int fuse_request_send_notify_reply(struct fuse_conn *fc,
@@ -649,18 +649,6 @@ static int fuse_request_send_notify_reply(struct fuse_conn *fc, 
	return err;

}



/*

 * Called under fc->lock

 *

 * fc->connected must have been checked previously

 */

void fuse_request_send_background_locked(struct fuse_conn *fc,

					 struct fuse_req *req)

{

	req->isreply = 1;

	fuse_request_send_nowait_locked(fc, req);

}



void fuse_force_forget(struct file *file, u64 nodeid)

{

	struct inode *inode = file_inode(file);