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

Commit 1c294838 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-3.14-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs 

Pull 9p changes from Eric Van Hensbergen:
 "Included are a new cache model for support of mmap, and several
  cleanups across the filesystem and networking portions of the code"

* tag 'for-3.14-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
  9p: update documentation
  9P: introduction of a new cache=mmap model.
  net/9p: remove virtio default hack and set appropriate bits instead
  9p: remove useless 'name' variable and assignment
  9p: fix return value in case in v9fs_fid_xattr_set()
  9p: remove useless variable and assignment
  9p: remove useless assignment
  9p: remove unused 'super_block' struct pointer
  9p: remove never used return variable
  9p: remove unused 'p9_fid' struct pointer
  9p: remove unused 'p9_client' struct pointer
parents b2e448ec b871866e

Documentation/filesystems/9p.txt

+6 −11
Original line number Diff line number Diff line
@@ -69,10 +69,14 @@ OPTIONS 
  		offering several exported file systems.



  cache=mode	specifies a caching policy.  By default, no caches are used.

                        none = default no cache policy, metadata and data

                                alike are synchronous.

			loose = no attempts are made at consistency,

                                intended for exclusive, read-only mounts

                        fscache = use FS-Cache for a persistent, read-only

				cache backend.

                        mmap = minimal cache that is only used for read-write

                                mmap.  Northing else is cached, like cache=none



  debug=n	specifies debug level.  The debug level is a bitmask.

			0x01  = display verbose error messages
@@ -147,8 +151,7 @@ on sourceforge (http://sourceforge.net/projects/v9fs). 
News and other information is maintained on a Wiki.

(http://sf.net/apps/mediawiki/v9fs/index.php).



Bug reports may be issued through the kernel.org bugzilla 

(http://bugzilla.kernel.org)

Bug reports are best issued via the mailing list.



For more information on the Plan 9 Operating System check out

http://plan9.bell-labs.com/plan9
@@ -156,11 +159,3 @@ http://plan9.bell-labs.com/plan9 
For information on Plan 9 from User Space (Plan 9 applications and libraries

ported to Linux/BSD/OSX/etc) check out http://swtch.com/plan9



STATUS

======



The 2.6 kernel support is working on PPC and x86.



PLEASE USE THE KERNEL BUGZILLA TO REPORT PROBLEMS. (http://bugzilla.kernel.org)

fs/9p/cache.c

+1 −2
Original line number Diff line number Diff line
@@ -239,13 +239,12 @@ void v9fs_cache_inode_flush_cookie(struct inode *inode) 
void v9fs_cache_inode_set_cookie(struct inode *inode, struct file *filp)

{

	struct v9fs_inode *v9inode = V9FS_I(inode);

	struct p9_fid *fid;



	if (!v9inode->fscache)

		return;



	spin_lock(&v9inode->fscache_lock);

	fid = filp->private_data;



	if ((filp->f_flags & O_ACCMODE) != O_RDONLY)

		v9fs_cache_inode_flush_cookie(inode);

	else

fs/9p/v9fs.c

+8 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ enum { 
	/* Options that take no arguments */

	Opt_nodevmap,

	/* Cache options */

	Opt_cache_loose, Opt_fscache,

	Opt_cache_loose, Opt_fscache, Opt_mmap,

	/* Access options */

	Opt_access, Opt_posixacl,

	/* Error token */
@@ -74,6 +74,7 @@ static const match_table_t tokens = { 
	{Opt_cache, "cache=%s"},

	{Opt_cache_loose, "loose"},

	{Opt_fscache, "fscache"},

	{Opt_mmap, "mmap"},

	{Opt_cachetag, "cachetag=%s"},

	{Opt_access, "access=%s"},

	{Opt_posixacl, "posixacl"},
@@ -91,6 +92,9 @@ static int get_cache_mode(char *s) 
	} else if (!strcmp(s, "fscache")) {

		version = CACHE_FSCACHE;

		p9_debug(P9_DEBUG_9P, "Cache mode: fscache\n");

	} else if (!strcmp(s, "mmap")) {

		version = CACHE_MMAP;

		p9_debug(P9_DEBUG_9P, "Cache mode: mmap\n");

	} else if (!strcmp(s, "none")) {

		version = CACHE_NONE;

		p9_debug(P9_DEBUG_9P, "Cache mode: none\n");
@@ -220,6 +224,9 @@ static int v9fs_parse_options(struct v9fs_session_info *v9ses, char *opts) 
		case Opt_fscache:

			v9ses->cache = CACHE_FSCACHE;

			break;

		case Opt_mmap:

			v9ses->cache = CACHE_MMAP;

			break;

		case Opt_cachetag:

#ifdef CONFIG_9P_FSCACHE

			v9ses->cachetag = match_strdup(&args[0]);

fs/9p/v9fs.h

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ enum p9_session_flags { 


enum p9_cache_modes {

	CACHE_NONE,

	CACHE_MMAP,

	CACHE_LOOSE,

	CACHE_FSCACHE,

};

fs/9p/v9fs_vfs.h

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ extern const struct dentry_operations v9fs_dentry_operations; 
extern const struct dentry_operations v9fs_cached_dentry_operations;

extern const struct file_operations v9fs_cached_file_operations;

extern const struct file_operations v9fs_cached_file_operations_dotl;

extern const struct file_operations v9fs_mmap_file_operations;

extern const struct file_operations v9fs_mmap_file_operations_dotl;

extern struct kmem_cache *v9fs_inode_cache;



struct inode *v9fs_alloc_inode(struct super_block *sb);