Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5fec8bdb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: clean up annotations of fc->lock
  fuse: fix sparse warning in ioctl
  fuse: update interface version
  fuse: add fuse_conn->release()
  fuse: separate out fuse_conn_init() from new_conn()
  fuse: add fuse_ prefix to several functions
  fuse: implement poll support
  fuse: implement unsolicited notification
  fuse: add file kernel handle
  fuse: implement ioctl support
  fuse: don't let fuse_req->end() put the base reference
  fuse: move FUSE_MINOR to miscdevice.h
  fuse: style fixes
parents 59e3af21 5d9ec854

fs/fuse/control.c

+4 −2
Original line number Diff line number Diff line 
/*

  FUSE: Filesystem in Userspace

  Copyright (C) 2001-2006  Miklos Szeredi <miklos@szeredi.hu>

  Copyright (C) 2001-2008  Miklos Szeredi <miklos@szeredi.hu>



  This program can be distributed under the terms of the GNU GPL.

  See the file COPYING.
@@ -48,11 +48,13 @@ static ssize_t fuse_conn_waiting_read(struct file *file, char __user *buf, 
	size_t size;



	if (!*ppos) {

		long value;

		struct fuse_conn *fc = fuse_ctl_file_conn_get(file);

		if (!fc)

			return 0;



		file->private_data=(void *)(long)atomic_read(&fc->num_waiting);

		value = atomic_read(&fc->num_waiting);

		file->private_data = (void *)value;

		fuse_conn_put(fc);

	}

	size = sprintf(tmp, "%ld\n", (long)file->private_data);

fs/fuse/dev.c

+83 −30
Original line number Diff line number Diff line 
/*

  FUSE: Filesystem in Userspace

  Copyright (C) 2001-2006  Miklos Szeredi <miklos@szeredi.hu>

  Copyright (C) 2001-2008  Miklos Szeredi <miklos@szeredi.hu>



  This program can be distributed under the terms of the GNU GPL.

  See the file COPYING.
@@ -269,7 +269,7 @@ static void flush_bg_queue(struct fuse_conn *fc) 
 * Called with fc->lock, unlocks it

 */

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

	__releases(fc->lock)

__releases(&fc->lock)

{

	void (*end) (struct fuse_conn *, struct fuse_req *) = req->end;

	req->end = NULL;
@@ -293,13 +293,13 @@ static void request_end(struct fuse_conn *fc, struct fuse_req *req) 
	wake_up(&req->waitq);

	if (end)

		end(fc, req);

	else

	fuse_put_request(fc, req);

}



static void wait_answer_interruptible(struct fuse_conn *fc,

				      struct fuse_req *req)

	__releases(fc->lock) __acquires(fc->lock)

__releases(&fc->lock)

__acquires(&fc->lock)

{

	if (signal_pending(current))

		return;
@@ -317,7 +317,8 @@ static void queue_interrupt(struct fuse_conn *fc, struct fuse_req *req) 
}



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

	__releases(fc->lock) __acquires(fc->lock)

__releases(&fc->lock)

__acquires(&fc->lock)

{

	if (!fc->no_interrupt) {

		/* Any signal may interrupt this */
@@ -380,7 +381,7 @@ static void request_wait_answer(struct fuse_conn *fc, struct fuse_req *req) 
	}

}



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

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

{

	req->isreply = 1;

	spin_lock(&fc->lock);
@@ -399,7 +400,7 @@ void request_send(struct fuse_conn *fc, struct fuse_req *req) 
	spin_unlock(&fc->lock);

}



static void request_send_nowait_locked(struct fuse_conn *fc,

static void fuse_request_send_nowait_locked(struct fuse_conn *fc,

					    struct fuse_req *req)

{

	req->background = 1;
@@ -414,11 +415,11 @@ static void request_send_nowait_locked(struct fuse_conn *fc, 
	flush_bg_queue(fc);

}



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

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

{

	spin_lock(&fc->lock);

	if (fc->connected) {

		request_send_nowait_locked(fc, req);

		fuse_request_send_nowait_locked(fc, req);

		spin_unlock(&fc->lock);

	} else {

		req->out.h.error = -ENOTCONN;
@@ -426,16 +427,16 @@ static void request_send_nowait(struct fuse_conn *fc, struct fuse_req *req) 
	}

}



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

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

{

	req->isreply = 0;

	request_send_nowait(fc, req);

	fuse_request_send_nowait(fc, req);

}



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

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

{

	req->isreply = 1;

	request_send_nowait(fc, req);

	fuse_request_send_nowait(fc, req);

}



/*
@@ -443,10 +444,11 @@ void request_send_background(struct fuse_conn *fc, struct fuse_req *req) 
 *

 * fc->connected must have been checked previously

 */

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

void fuse_request_send_background_locked(struct fuse_conn *fc,

					 struct fuse_req *req)

{

	req->isreply = 1;

	request_send_nowait_locked(fc, req);

	fuse_request_send_nowait_locked(fc, req);

}



/*
@@ -589,9 +591,11 @@ static int fuse_copy_page(struct fuse_copy_state *cs, struct page *page, 
		kunmap_atomic(mapaddr, KM_USER1);

	}

	while (count) {

		int err;

		if (!cs->len && (err = fuse_copy_fill(cs)))

		if (!cs->len) {

			int err = fuse_copy_fill(cs);

			if (err)

				return err;

		}

		if (page) {

			void *mapaddr = kmap_atomic(page, KM_USER1);

			void *buf = mapaddr + offset;
@@ -631,9 +635,11 @@ static int fuse_copy_pages(struct fuse_copy_state *cs, unsigned nbytes, 
static int fuse_copy_one(struct fuse_copy_state *cs, void *val, unsigned size)

{

	while (size) {

		int err;

		if (!cs->len && (err = fuse_copy_fill(cs)))

		if (!cs->len) {

			int err = fuse_copy_fill(cs);

			if (err)

				return err;

		}

		fuse_copy_do(cs, &val, &size);

	}

	return 0;
@@ -664,6 +670,8 @@ static int request_pending(struct fuse_conn *fc) 


/* Wait until a request is available on the pending list */

static void request_wait(struct fuse_conn *fc)

__releases(&fc->lock)

__acquires(&fc->lock)

{

	DECLARE_WAITQUEUE(wait, current);
@@ -691,7 +699,7 @@ static void request_wait(struct fuse_conn *fc) 
 */

static int fuse_read_interrupt(struct fuse_conn *fc, struct fuse_req *req,

			       const struct iovec *iov, unsigned long nr_segs)

	__releases(fc->lock)

__releases(&fc->lock)

{

	struct fuse_copy_state cs;

	struct fuse_in_header ih;
@@ -813,6 +821,34 @@ static ssize_t fuse_dev_read(struct kiocb *iocb, const struct iovec *iov, 
	return err;

}



static int fuse_notify_poll(struct fuse_conn *fc, unsigned int size,

			    struct fuse_copy_state *cs)

{

	struct fuse_notify_poll_wakeup_out outarg;

	int err;



	if (size != sizeof(outarg))

		return -EINVAL;



	err = fuse_copy_one(cs, &outarg, sizeof(outarg));

	if (err)

		return err;



	return fuse_notify_poll_wakeup(fc, &outarg);

}



static int fuse_notify(struct fuse_conn *fc, enum fuse_notify_code code,

		       unsigned int size, struct fuse_copy_state *cs)

{

	switch (code) {

	case FUSE_NOTIFY_POLL:

		return fuse_notify_poll(fc, size, cs);



	default:

		return -EINVAL;

	}

}



/* Look up request on processing list by unique ID */

static struct fuse_req *request_find(struct fuse_conn *fc, u64 unique)

{
@@ -876,9 +912,23 @@ static ssize_t fuse_dev_write(struct kiocb *iocb, const struct iovec *iov, 
	err = fuse_copy_one(&cs, &oh, sizeof(oh));

	if (err)

		goto err_finish;



	err = -EINVAL;

	if (!oh.unique || oh.error <= -1000 || oh.error > 0 ||

	    oh.len != nbytes)

	if (oh.len != nbytes)

		goto err_finish;



	/*

	 * Zero oh.unique indicates unsolicited notification message

	 * and error contains notification code.

	 */

	if (!oh.unique) {

		err = fuse_notify(fc, oh.error, nbytes - sizeof(oh), &cs);

		fuse_copy_finish(&cs);

		return err ? err : nbytes;

	}



	err = -EINVAL;

	if (oh.error <= -1000 || oh.error > 0)

		goto err_finish;



	spin_lock(&fc->lock);
@@ -966,6 +1016,8 @@ static unsigned fuse_dev_poll(struct file *file, poll_table *wait) 
 * This function releases and reacquires fc->lock

 */

static void end_requests(struct fuse_conn *fc, struct list_head *head)

__releases(&fc->lock)

__acquires(&fc->lock)

{

	while (!list_empty(head)) {

		struct fuse_req *req;
@@ -988,7 +1040,8 @@ static void end_requests(struct fuse_conn *fc, struct list_head *head) 
 * locked).

 */

static void end_io_requests(struct fuse_conn *fc)

	__releases(fc->lock) __acquires(fc->lock)

__releases(&fc->lock)

__acquires(&fc->lock)

{

	while (!list_empty(&fc->io)) {

		struct fuse_req *req =
@@ -1002,11 +1055,11 @@ static void end_io_requests(struct fuse_conn *fc) 
		wake_up(&req->waitq);

		if (end) {

			req->end = NULL;

			/* The end function will consume this reference */

			__fuse_get_request(req);

			spin_unlock(&fc->lock);

			wait_event(req->waitq, !req->locked);

			end(fc, req);

			fuse_put_request(fc, req);

			spin_lock(&fc->lock);

		}

	}

fs/fuse/dir.c

+25 −23
Original line number Diff line number Diff line 
/*

  FUSE: Filesystem in Userspace

  Copyright (C) 2001-2006  Miklos Szeredi <miklos@szeredi.hu>

  Copyright (C) 2001-2008  Miklos Szeredi <miklos@szeredi.hu>



  This program can be distributed under the terms of the GNU GPL.

  See the file COPYING.
@@ -189,7 +189,7 @@ static int fuse_dentry_revalidate(struct dentry *entry, struct nameidata *nd) 
		parent = dget_parent(entry);

		fuse_lookup_init(fc, req, get_node_id(parent->d_inode),

				 &entry->d_name, &outarg);

		request_send(fc, req);

		fuse_request_send(fc, req);

		dput(parent);

		err = req->out.h.error;

		fuse_put_request(fc, req);
@@ -283,7 +283,7 @@ int fuse_lookup_name(struct super_block *sb, u64 nodeid, struct qstr *name, 
	attr_version = fuse_get_attr_version(fc);



	fuse_lookup_init(fc, req, nodeid, name, outarg);

	request_send(fc, req);

	fuse_request_send(fc, req);

	err = req->out.h.error;

	fuse_put_request(fc, req);

	/* Zero nodeid is same as -ENOENT, but with valid timeout */
@@ -369,7 +369,7 @@ static void fuse_sync_release(struct fuse_conn *fc, struct fuse_file *ff, 
{

	fuse_release_fill(ff, nodeid, flags, FUSE_RELEASE);

	ff->reserved_req->force = 1;

	request_send(fc, ff->reserved_req);

	fuse_request_send(fc, ff->reserved_req);

	fuse_put_request(fc, ff->reserved_req);

	kfree(ff);

}
@@ -408,7 +408,7 @@ static int fuse_create_open(struct inode *dir, struct dentry *entry, int mode, 
		goto out_put_forget_req;



	err = -ENOMEM;

	ff = fuse_file_alloc();

	ff = fuse_file_alloc(fc);

	if (!ff)

		goto out_put_request;
@@ -432,7 +432,7 @@ static int fuse_create_open(struct inode *dir, struct dentry *entry, int mode, 
	req->out.args[0].value = &outentry;

	req->out.args[1].size = sizeof(outopen);

	req->out.args[1].value = &outopen;

	request_send(fc, req);

	fuse_request_send(fc, req);

	err = req->out.h.error;

	if (err) {

		if (err == -ENOSYS)
@@ -502,7 +502,7 @@ static int create_new_entry(struct fuse_conn *fc, struct fuse_req *req, 
	else

		req->out.args[0].size = sizeof(outarg);

	req->out.args[0].value = &outarg;

	request_send(fc, req);

	fuse_request_send(fc, req);

	err = req->out.h.error;

	fuse_put_request(fc, req);

	if (err)
@@ -631,15 +631,17 @@ static int fuse_unlink(struct inode *dir, struct dentry *entry) 
	req->in.numargs = 1;

	req->in.args[0].size = entry->d_name.len + 1;

	req->in.args[0].value = entry->d_name.name;

	request_send(fc, req);

	fuse_request_send(fc, req);

	err = req->out.h.error;

	fuse_put_request(fc, req);

	if (!err) {

		struct inode *inode = entry->d_inode;



		/* Set nlink to zero so the inode can be cleared, if

                   the inode does have more links this will be

                   discovered at the next lookup/getattr */

		/*

		 * Set nlink to zero so the inode can be cleared, if the inode

		 * does have more links this will be discovered at the next

		 * lookup/getattr.

		 */

		clear_nlink(inode);

		fuse_invalidate_attr(inode);

		fuse_invalidate_attr(dir);
@@ -662,7 +664,7 @@ static int fuse_rmdir(struct inode *dir, struct dentry *entry) 
	req->in.numargs = 1;

	req->in.args[0].size = entry->d_name.len + 1;

	req->in.args[0].value = entry->d_name.name;

	request_send(fc, req);

	fuse_request_send(fc, req);

	err = req->out.h.error;

	fuse_put_request(fc, req);

	if (!err) {
@@ -695,7 +697,7 @@ static int fuse_rename(struct inode *olddir, struct dentry *oldent, 
	req->in.args[1].value = oldent->d_name.name;

	req->in.args[2].size = newent->d_name.len + 1;

	req->in.args[2].value = newent->d_name.name;

	request_send(fc, req);

	fuse_request_send(fc, req);

	err = req->out.h.error;

	fuse_put_request(fc, req);

	if (!err) {
@@ -811,7 +813,7 @@ static int fuse_do_getattr(struct inode *inode, struct kstat *stat, 
	else

		req->out.args[0].size = sizeof(outarg);

	req->out.args[0].value = &outarg;

	request_send(fc, req);

	fuse_request_send(fc, req);

	err = req->out.h.error;

	fuse_put_request(fc, req);

	if (!err) {
@@ -911,7 +913,7 @@ static int fuse_access(struct inode *inode, int mask) 
	req->in.numargs = 1;

	req->in.args[0].size = sizeof(inarg);

	req->in.args[0].value = &inarg;

	request_send(fc, req);

	fuse_request_send(fc, req);

	err = req->out.h.error;

	fuse_put_request(fc, req);

	if (err == -ENOSYS) {
@@ -1033,7 +1035,7 @@ static int fuse_readdir(struct file *file, void *dstbuf, filldir_t filldir) 
	req->num_pages = 1;

	req->pages[0] = page;

	fuse_read_fill(req, file, inode, file->f_pos, PAGE_SIZE, FUSE_READDIR);

	request_send(fc, req);

	fuse_request_send(fc, req);

	nbytes = req->out.args[0].size;

	err = req->out.h.error;

	fuse_put_request(fc, req);
@@ -1067,7 +1069,7 @@ static char *read_link(struct dentry *dentry) 
	req->out.numargs = 1;

	req->out.args[0].size = PAGE_SIZE - 1;

	req->out.args[0].value = link;

	request_send(fc, req);

	fuse_request_send(fc, req);

	if (req->out.h.error) {

		free_page((unsigned long) link);

		link = ERR_PTR(req->out.h.error);
@@ -1273,7 +1275,7 @@ static int fuse_do_setattr(struct dentry *entry, struct iattr *attr, 
	else

		req->out.args[0].size = sizeof(outarg);

	req->out.args[0].value = &outarg;

	request_send(fc, req);

	fuse_request_send(fc, req);

	err = req->out.h.error;

	fuse_put_request(fc, req);

	if (err) {
@@ -1367,7 +1369,7 @@ static int fuse_setxattr(struct dentry *entry, const char *name, 
	req->in.args[1].value = name;

	req->in.args[2].size = size;

	req->in.args[2].value = value;

	request_send(fc, req);

	fuse_request_send(fc, req);

	err = req->out.h.error;

	fuse_put_request(fc, req);

	if (err == -ENOSYS) {
@@ -1413,7 +1415,7 @@ static ssize_t fuse_getxattr(struct dentry *entry, const char *name, 
		req->out.args[0].size = sizeof(outarg);

		req->out.args[0].value = &outarg;

	}

	request_send(fc, req);

	fuse_request_send(fc, req);

	ret = req->out.h.error;

	if (!ret)

		ret = size ? req->out.args[0].size : outarg.size;
@@ -1463,7 +1465,7 @@ static ssize_t fuse_listxattr(struct dentry *entry, char *list, size_t size) 
		req->out.args[0].size = sizeof(outarg);

		req->out.args[0].value = &outarg;

	}

	request_send(fc, req);

	fuse_request_send(fc, req);

	ret = req->out.h.error;

	if (!ret)

		ret = size ? req->out.args[0].size : outarg.size;
@@ -1496,7 +1498,7 @@ static int fuse_removexattr(struct dentry *entry, const char *name) 
	req->in.numargs = 1;

	req->in.args[0].size = strlen(name) + 1;

	req->in.args[0].value = name;

	request_send(fc, req);

	fuse_request_send(fc, req);

	err = req->out.h.error;

	fuse_put_request(fc, req);

	if (err == -ENOSYS) {

fs/fuse/file.c

+438 −19

File changed.

Preview size limit exceeded, changes collapsed.

fs/fuse/fuse_i.h

+59 −24
Original line number Diff line number Diff line 
/*

  FUSE: Filesystem in Userspace

  Copyright (C) 2001-2006  Miklos Szeredi <miklos@szeredi.hu>

  Copyright (C) 2001-2008  Miklos Szeredi <miklos@szeredi.hu>



  This program can be distributed under the terms of the GNU GPL.

  See the file COPYING.
@@ -19,6 +19,8 @@ 
#include <linux/backing-dev.h>

#include <linux/mutex.h>

#include <linux/rwsem.h>

#include <linux/rbtree.h>

#include <linux/poll.h>



/** Max number of pages that can be used in a single read request */

#define FUSE_MAX_PAGES_PER_REQ 32
@@ -100,6 +102,9 @@ struct fuse_file { 
	/** Request reserved for flush and release */

	struct fuse_req *reserved_req;



	/** Kernel file handle guaranteed to be unique */

	u64 kh;



	/** File handle used by userspace */

	u64 fh;
@@ -108,6 +113,12 @@ struct fuse_file { 


	/** Entry on inode's write_files list */

	struct list_head write_entry;



	/** RB node to be linked on fuse_conn->polled_files */

	struct rb_node polled_node;



	/** Wait queue head for poll */

	wait_queue_head_t poll_wait;

};



/** One input argument of a request */
@@ -322,6 +333,12 @@ struct fuse_conn { 
	/** The list of requests under I/O */

	struct list_head io;



	/** The next unique kernel file handle */

	u64 khctr;



	/** rbtree of fuse_files waiting for poll events indexed by ph */

	struct rb_root polled_files;



	/** Number of requests currently in the background */

	unsigned num_background;
@@ -410,6 +427,9 @@ struct fuse_conn { 
	/** Is bmap not implemented by fs? */

	unsigned no_bmap:1;



	/** Is poll not implemented by fs? */

	unsigned no_poll:1;



	/** Do multi-page cached writes */

	unsigned big_writes:1;
@@ -445,6 +465,9 @@ struct fuse_conn { 


	/** Version counter for attribute changes */

	u64 attr_version;



	/** Called on final put */

	void (*release)(struct fuse_conn *);

};



static inline struct fuse_conn *get_fuse_conn_super(struct super_block *sb)
@@ -499,7 +522,7 @@ void fuse_read_fill(struct fuse_req *req, struct file *file, 
 */

int fuse_open_common(struct inode *inode, struct file *file, int isdir);



struct fuse_file *fuse_file_alloc(void);

struct fuse_file *fuse_file_alloc(struct fuse_conn *fc);

void fuse_file_free(struct fuse_file *ff);

void fuse_finish_open(struct inode *inode, struct file *file,

		      struct fuse_file *ff, struct fuse_open_out *outarg);
@@ -518,6 +541,12 @@ int fuse_release_common(struct inode *inode, struct file *file, int isdir); 
int fuse_fsync_common(struct file *file, struct dentry *de, int datasync,

		      int isdir);



/**

 * Notify poll wakeup

 */

int fuse_notify_poll_wakeup(struct fuse_conn *fc,

			    struct fuse_notify_poll_wakeup_out *outarg);



/**

 * Initialize file operations on a regular file

 */
@@ -593,19 +622,20 @@ void fuse_put_request(struct fuse_conn *fc, struct fuse_req *req); 
/**

 * Send a request (synchronous)

 */

void request_send(struct fuse_conn *fc, struct fuse_req *req);

void fuse_request_send(struct fuse_conn *fc, struct fuse_req *req);



/**

 * Send a request with no reply

 */

void request_send_noreply(struct fuse_conn *fc, struct fuse_req *req);

void fuse_request_send_noreply(struct fuse_conn *fc, struct fuse_req *req);



/**

 * Send a request in the background

 */

void request_send_background(struct fuse_conn *fc, struct fuse_req *req);

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



void request_send_background_locked(struct fuse_conn *fc, struct fuse_req *req);

void fuse_request_send_background_locked(struct fuse_conn *fc,

					 struct fuse_req *req);



/* Abort all requests */

void fuse_abort_conn(struct fuse_conn *fc);
@@ -622,6 +652,11 @@ void fuse_invalidate_entry_cache(struct dentry *entry); 
 */

struct fuse_conn *fuse_conn_get(struct fuse_conn *fc);



/**

 * Initialize fuse_conn

 */

int fuse_conn_init(struct fuse_conn *fc, struct super_block *sb);



/**

 * Release reference to fuse_conn

 */