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

Commit 19d2f8e0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-3.11-merge-window-part-2' of... 

Merge tag 'for-linus-3.11-merge-window-part-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs

Pull second round of 9p patches from Eric Van Hensbergen:
 "Several of these patches were rebased in order to correct style
  issues.  Only stylistic changes were made versus the patches which
  were in linux-next for two weeks.  The rebases have been in linux-next
  for 3 days and have passed my regressions.

  The bulk of these are RDMA fixes and improvements.  There's also some
  additions on the extended attributes front to support some additional
  namespaces and a new option for TCP to force allocation of mount
  requests from a priviledged port"

* tag 'for-linus-3.11-merge-window-part-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
  fs/9p: Remove the unused variable "err" in v9fs_vfs_getattr()
  9P: Add cancelled() to the transport functions.
  9P/RDMA: count posted buffers without a pending request
  9P/RDMA: Improve error handling in rdma_request
  9P/RDMA: Do not free req->rc in error handling in rdma_request()
  9P/RDMA: Use a semaphore to protect the RQ
  9P/RDMA: Protect against duplicate replies
  9P/RDMA: increase P9_RDMA_MAXSIZE to 1MB
  9pnet: refactor struct p9_fcall alloc code
  9P/RDMA: rdma_request() needs not allocate req->rc
  9P: Fix fcall allocation for rdma
  fs/9p: xattr: add trusted and security namespaces
  net/9p: add privport option to 9p tcp transport
parents 746919d2 f2692ea8

fs/9p/Kconfig

+13 −0
Original line number Diff line number Diff line
@@ -31,3 +31,16 @@ config 9P_FS_POSIX_ACL 
	  If you don't know what Access Control Lists are, say N



endif





config 9P_FS_SECURITY

        bool "9P Security Labels"

        depends on 9P_FS

        help

          Security labels support alternative access control models

          implemented by security modules like SELinux.  This option

          enables an extended attribute handler for file security

          labels in the 9P filesystem.



          If you are not using a security module that requires using

          extended attributes for file security labels, say N.

fs/9p/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -11,7 +11,9 @@ obj-$(CONFIG_9P_FS) := 9p.o 
	v9fs.o \

	fid.o  \

	xattr.o \

	xattr_user.o

	xattr_user.o \

	xattr_trusted.o



9p-$(CONFIG_9P_FSCACHE) += cache.o

9p-$(CONFIG_9P_FS_POSIX_ACL) += acl.o

9p-$(CONFIG_9P_FS_SECURITY) += xattr_security.o

fs/9p/vfs_inode.c

+0 −2
Original line number Diff line number Diff line
@@ -1054,13 +1054,11 @@ static int 
v9fs_vfs_getattr(struct vfsmount *mnt, struct dentry *dentry,

		 struct kstat *stat)

{

	int err;

	struct v9fs_session_info *v9ses;

	struct p9_fid *fid;

	struct p9_wstat *st;



	p9_debug(P9_DEBUG_VFS, "dentry: %p\n", dentry);

	err = -EPERM;

	v9ses = v9fs_dentry2v9ses(dentry);

	if (v9ses->cache == CACHE_LOOSE || v9ses->cache == CACHE_FSCACHE) {

		generic_fillattr(dentry->d_inode, stat);

fs/9p/xattr.c

+4 −0
Original line number Diff line number Diff line
@@ -167,9 +167,13 @@ ssize_t v9fs_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size) 


const struct xattr_handler *v9fs_xattr_handlers[] = {

	&v9fs_xattr_user_handler,

	&v9fs_xattr_trusted_handler,

#ifdef CONFIG_9P_FS_POSIX_ACL

	&v9fs_xattr_acl_access_handler,

	&v9fs_xattr_acl_default_handler,

#endif

#ifdef CONFIG_9P_FS_SECURITY

	&v9fs_xattr_security_handler,

#endif

	NULL

};

fs/9p/xattr.h

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 


extern const struct xattr_handler *v9fs_xattr_handlers[];

extern struct xattr_handler v9fs_xattr_user_handler;

extern struct xattr_handler v9fs_xattr_trusted_handler;

extern struct xattr_handler v9fs_xattr_security_handler;

extern const struct xattr_handler v9fs_xattr_acl_access_handler;

extern const struct xattr_handler v9fs_xattr_acl_default_handler;