Commit 580640ba authored by Miklos Szeredi's avatar Miklos Szeredi
Browse files

fuse: flush requests on umount 



Use fuse_abort_conn() instead of fuse_conn_kill() in fuse_put_super().
This flushes and aborts requests still on any queues.  But since we've
already reset fc->connected, those requests would not be useful anyway and
would be flushed when the fuse device is closed.

Next patches will rely on requests being flushed before the superblock is
destroyed.

Use fuse_abort_conn() in cuse_process_init_reply() too, since it makes no
difference there, and we can get rid of fuse_conn_kill().

Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
parent 0c4dd4ba

fs/fuse/cuse.c

+1 −1
Original line number Diff line number Diff line
@@ -415,7 +415,7 @@ err_unlock: 
err_region:

	unregister_chrdev_region(devt, 1);

err:

	fuse_conn_kill(fc);

	fuse_abort_conn(fc);

	goto out;

}

fs/fuse/fuse_i.h

+0 −2
Original line number Diff line number Diff line
@@ -804,8 +804,6 @@ void fuse_invalidate_atime(struct inode *inode); 
 */

struct fuse_conn *fuse_conn_get(struct fuse_conn *fc);



void fuse_conn_kill(struct fuse_conn *fc);



/**

 * Initialize fuse_conn

 */

fs/fuse/inode.c

+1 −15
Original line number Diff line number Diff line
@@ -376,27 +376,13 @@ static void fuse_bdi_destroy(struct fuse_conn *fc) 
		bdi_destroy(&fc->bdi);

}



void fuse_conn_kill(struct fuse_conn *fc)

{

	spin_lock(&fc->lock);

	fc->connected = 0;

	fc->blocked = 0;

	fc->initialized = 1;

	spin_unlock(&fc->lock);

	/* Flush all readers on this fs */

	kill_fasync(&fc->fasync, SIGIO, POLL_IN);

	wake_up_all(&fc->waitq);

	wake_up_all(&fc->blocked_waitq);

}

EXPORT_SYMBOL_GPL(fuse_conn_kill);



static void fuse_put_super(struct super_block *sb)

{

	struct fuse_conn *fc = get_fuse_conn_super(sb);



	fuse_send_destroy(fc);



	fuse_conn_kill(fc);

	fuse_abort_conn(fc);

	mutex_lock(&fuse_mutex);

	list_del(&fc->entry);

	fuse_ctl_remove_conn(fc);

CRA Git | Maintained and supported by SUSTech CRA and CCSE