 c224b76b56
			
		
	
	
	c224b76b56
	
	
	
		
			
			Highlights include:
 
 - Changes to the RPC socket code to allow NFSv4 to turn off timeout+retry
   - Detect TCP connection breakage through the "keepalive" mechanism
 - Add client side support for NFSv4.x migration (Chuck Lever)
 - Add support for multiple security flavour arguments to the "sec=" mount
   option (Dros Adamson)
 - fs-cache bugfixes from David Howells:
   - Fix an issue whereby caching can be enabled on a file that is open for
     writing
 - More NFSv4 open code stable bugfixes
 - Various Labeled NFS (selinux) bugfixes, including one stable fix
 - Fix buffer overflow checking in the RPCSEC_GSS upcall encoding
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.15 (GNU/Linux)
 
 iQIcBAABAgAGBQJSe8TEAAoJEGcL54qWCgDydu0QAJVtVhfwlUKm/HZ4oAy0Q5T8
 rJOWupqGnwyqTNLIRTlNegFSwMY+bABbkihXzSoj641o5zRb200KePlNxknzzlu1
 Q715035LDeEC1jrrHHeztTa9uWxAZ9B6gstMzilJYbV72VRYuWA6Q5LstXwQy/jN
 ViSldrGJ4sRZUe6wpNLPBRDBfOMWOtZdyRqqqjm71ZHJJnaqQWLBvThTG4MsLlpg
 j/khi5189MxJWePTKI9zGZdnXZAZ0ar1tAi1QWDNv044EwsS3LZZIko+YdBh6LZx
 9IBwk6TqOXFY0jxPDsIZtTfWPf4pjewRrPINMkjlZl3TJEf97sIlavZ7gWqvVIz5
 eXzFGy7D2XBgub8TGcmZM/7keHY/sqghz7lXZ8FulXlVem52r/95NiQ9tu8l8hq3
 Ab0FUnjtXeuaDFPBCHlKb3zmCMGFF89VqtpCj2plCPvfcGgJvXJqddWBRisQw9St
 UgD1PQWRFGtkrHv5EcQkd5boVdRNjAVAC9PaCWNpOpSVDjJyuUE+v/k75+ZwDcG8
 afAFMJSbCwRxW+cFlLAsQTfQztzuWTTOOVQvJDxfyYulcWshyIruhiYItRDfJqRp
 RynuVzrBERzUs5wsefnBbC218C/WSlOrodPbsZvdhKolvRx1RNtWT29ilZ6+p2tH
 4378ZRLtQvm9RXBnAkRc
 =gflJ
 -----END PGP SIGNATURE-----
Merge tag 'nfs-for-3.13-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
Pull NFS client updates from Trond Myklebust:
 "Highlights include:
   - Changes to the RPC socket code to allow NFSv4 to turn off
     timeout+retry:
      * Detect TCP connection breakage through the "keepalive" mechanism
   - Add client side support for NFSv4.x migration (Chuck Lever)
   - Add support for multiple security flavour arguments to the "sec="
     mount option (Dros Adamson)
   - fs-cache bugfixes from David Howells:
     * Fix an issue whereby caching can be enabled on a file that is
       open for writing
   - More NFSv4 open code stable bugfixes
   - Various Labeled NFS (selinux) bugfixes, including one stable fix
   - Fix buffer overflow checking in the RPCSEC_GSS upcall encoding"
* tag 'nfs-for-3.13-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (68 commits)
  NFSv4.2: Remove redundant checks in nfs_setsecurity+nfs4_label_init_security
  NFSv4: Sanity check the server reply in _nfs4_server_capabilities
  NFSv4.2: encode_readdir - only ask for labels when doing readdirplus
  nfs: set security label when revalidating inode
  NFSv4.2: Fix a mismatch between Linux labeled NFS and the NFSv4.2 spec
  NFS: Fix a missing initialisation when reading the SELinux label
  nfs: fix oops when trying to set SELinux label
  nfs: fix inverted test for delegation in nfs4_reclaim_open_state
  SUNRPC: Cleanup xs_destroy()
  SUNRPC: close a rare race in xs_tcp_setup_socket.
  SUNRPC: remove duplicated include from clnt.c
  nfs: use IS_ROOT not DCACHE_DISCONNECTED
  SUNRPC: Fix buffer overflow checking in gss_encode_v0_msg/gss_encode_v1_msg
  SUNRPC: gss_alloc_msg - choose _either_ a v0 message or a v1 message
  SUNRPC: remove an unnecessary if statement
  nfs: Use PTR_ERR_OR_ZERO in 'nfs/nfs4super.c'
  nfs: Use PTR_ERR_OR_ZERO in 'nfs41_callback_up' function
  nfs: Remove useless 'error' assignment
  sunrpc: comment typo fix
  SUNRPC: Add correct rcu_dereference annotation in rpc_clnt_set_transport
  ...
		
	
			
		
			
				
	
	
		
			242 lines
		
	
	
	
		
			6.8 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			242 lines
		
	
	
	
		
			6.8 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  *   fs/cifs/fscache.c - CIFS filesystem cache interface
 | |
|  *
 | |
|  *   Copyright (c) 2010 Novell, Inc.
 | |
|  *   Author(s): Suresh Jayaraman <sjayaraman@suse.de>
 | |
|  *
 | |
|  *   This library is free software; you can redistribute it and/or modify
 | |
|  *   it under the terms of the GNU Lesser General Public License as published
 | |
|  *   by the Free Software Foundation; either version 2.1 of the License, or
 | |
|  *   (at your option) any later version.
 | |
|  *
 | |
|  *   This library is distributed in the hope that it will be useful,
 | |
|  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
 | |
|  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
 | |
|  *   the GNU Lesser General Public License for more details.
 | |
|  *
 | |
|  *   You should have received a copy of the GNU Lesser General Public License
 | |
|  *   along with this library; if not, write to the Free Software
 | |
|  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 | |
|  */
 | |
| #include "fscache.h"
 | |
| #include "cifsglob.h"
 | |
| #include "cifs_debug.h"
 | |
| #include "cifs_fs_sb.h"
 | |
| 
 | |
| void cifs_fscache_get_client_cookie(struct TCP_Server_Info *server)
 | |
| {
 | |
| 	server->fscache =
 | |
| 		fscache_acquire_cookie(cifs_fscache_netfs.primary_index,
 | |
| 				&cifs_fscache_server_index_def, server, true);
 | |
| 	cifs_dbg(FYI, "%s: (0x%p/0x%p)\n",
 | |
| 		 __func__, server, server->fscache);
 | |
| }
 | |
| 
 | |
| void cifs_fscache_release_client_cookie(struct TCP_Server_Info *server)
 | |
| {
 | |
| 	cifs_dbg(FYI, "%s: (0x%p/0x%p)\n",
 | |
| 		 __func__, server, server->fscache);
 | |
| 	fscache_relinquish_cookie(server->fscache, 0);
 | |
| 	server->fscache = NULL;
 | |
| }
 | |
| 
 | |
| void cifs_fscache_get_super_cookie(struct cifs_tcon *tcon)
 | |
| {
 | |
| 	struct TCP_Server_Info *server = tcon->ses->server;
 | |
| 
 | |
| 	tcon->fscache =
 | |
| 		fscache_acquire_cookie(server->fscache,
 | |
| 				&cifs_fscache_super_index_def, tcon, true);
 | |
| 	cifs_dbg(FYI, "%s: (0x%p/0x%p)\n",
 | |
| 		 __func__, server->fscache, tcon->fscache);
 | |
| }
 | |
| 
 | |
| void cifs_fscache_release_super_cookie(struct cifs_tcon *tcon)
 | |
| {
 | |
| 	cifs_dbg(FYI, "%s: (0x%p)\n", __func__, tcon->fscache);
 | |
| 	fscache_relinquish_cookie(tcon->fscache, 0);
 | |
| 	tcon->fscache = NULL;
 | |
| }
 | |
| 
 | |
| static void cifs_fscache_enable_inode_cookie(struct inode *inode)
 | |
| {
 | |
| 	struct cifsInodeInfo *cifsi = CIFS_I(inode);
 | |
| 	struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
 | |
| 	struct cifs_tcon *tcon = cifs_sb_master_tcon(cifs_sb);
 | |
| 
 | |
| 	if (cifsi->fscache)
 | |
| 		return;
 | |
| 
 | |
| 	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_FSCACHE) {
 | |
| 		cifsi->fscache = fscache_acquire_cookie(tcon->fscache,
 | |
| 				&cifs_fscache_inode_object_def, cifsi, true);
 | |
| 		cifs_dbg(FYI, "%s: got FH cookie (0x%p/0x%p)\n",
 | |
| 			 __func__, tcon->fscache, cifsi->fscache);
 | |
| 	}
 | |
| }
 | |
| 
 | |
| void cifs_fscache_release_inode_cookie(struct inode *inode)
 | |
| {
 | |
| 	struct cifsInodeInfo *cifsi = CIFS_I(inode);
 | |
| 
 | |
| 	if (cifsi->fscache) {
 | |
| 		cifs_dbg(FYI, "%s: (0x%p)\n", __func__, cifsi->fscache);
 | |
| 		fscache_relinquish_cookie(cifsi->fscache, 0);
 | |
| 		cifsi->fscache = NULL;
 | |
| 	}
 | |
| }
 | |
| 
 | |
| static void cifs_fscache_disable_inode_cookie(struct inode *inode)
 | |
| {
 | |
| 	struct cifsInodeInfo *cifsi = CIFS_I(inode);
 | |
| 
 | |
| 	if (cifsi->fscache) {
 | |
| 		cifs_dbg(FYI, "%s: (0x%p)\n", __func__, cifsi->fscache);
 | |
| 		fscache_uncache_all_inode_pages(cifsi->fscache, inode);
 | |
| 		fscache_relinquish_cookie(cifsi->fscache, 1);
 | |
| 		cifsi->fscache = NULL;
 | |
| 	}
 | |
| }
 | |
| 
 | |
| void cifs_fscache_set_inode_cookie(struct inode *inode, struct file *filp)
 | |
| {
 | |
| 	if ((filp->f_flags & O_ACCMODE) != O_RDONLY)
 | |
| 		cifs_fscache_disable_inode_cookie(inode);
 | |
| 	else
 | |
| 		cifs_fscache_enable_inode_cookie(inode);
 | |
| }
 | |
| 
 | |
| void cifs_fscache_reset_inode_cookie(struct inode *inode)
 | |
| {
 | |
| 	struct cifsInodeInfo *cifsi = CIFS_I(inode);
 | |
| 	struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
 | |
| 	struct fscache_cookie *old = cifsi->fscache;
 | |
| 
 | |
| 	if (cifsi->fscache) {
 | |
| 		/* retire the current fscache cache and get a new one */
 | |
| 		fscache_relinquish_cookie(cifsi->fscache, 1);
 | |
| 
 | |
| 		cifsi->fscache = fscache_acquire_cookie(
 | |
| 					cifs_sb_master_tcon(cifs_sb)->fscache,
 | |
| 					&cifs_fscache_inode_object_def,
 | |
| 					cifsi, true);
 | |
| 		cifs_dbg(FYI, "%s: new cookie 0x%p oldcookie 0x%p\n",
 | |
| 			 __func__, cifsi->fscache, old);
 | |
| 	}
 | |
| }
 | |
| 
 | |
| int cifs_fscache_release_page(struct page *page, gfp_t gfp)
 | |
| {
 | |
| 	if (PageFsCache(page)) {
 | |
| 		struct inode *inode = page->mapping->host;
 | |
| 		struct cifsInodeInfo *cifsi = CIFS_I(inode);
 | |
| 
 | |
| 		cifs_dbg(FYI, "%s: (0x%p/0x%p)\n",
 | |
| 			 __func__, page, cifsi->fscache);
 | |
| 		if (!fscache_maybe_release_page(cifsi->fscache, page, gfp))
 | |
| 			return 0;
 | |
| 	}
 | |
| 
 | |
| 	return 1;
 | |
| }
 | |
| 
 | |
| static void cifs_readpage_from_fscache_complete(struct page *page, void *ctx,
 | |
| 						int error)
 | |
| {
 | |
| 	cifs_dbg(FYI, "%s: (0x%p/%d)\n", __func__, page, error);
 | |
| 	if (!error)
 | |
| 		SetPageUptodate(page);
 | |
| 	unlock_page(page);
 | |
| }
 | |
| 
 | |
| /*
 | |
|  * Retrieve a page from FS-Cache
 | |
|  */
 | |
| int __cifs_readpage_from_fscache(struct inode *inode, struct page *page)
 | |
| {
 | |
| 	int ret;
 | |
| 
 | |
| 	cifs_dbg(FYI, "%s: (fsc:%p, p:%p, i:0x%p\n",
 | |
| 		 __func__, CIFS_I(inode)->fscache, page, inode);
 | |
| 	ret = fscache_read_or_alloc_page(CIFS_I(inode)->fscache, page,
 | |
| 					 cifs_readpage_from_fscache_complete,
 | |
| 					 NULL,
 | |
| 					 GFP_KERNEL);
 | |
| 	switch (ret) {
 | |
| 
 | |
| 	case 0: /* page found in fscache, read submitted */
 | |
| 		cifs_dbg(FYI, "%s: submitted\n", __func__);
 | |
| 		return ret;
 | |
| 	case -ENOBUFS:	/* page won't be cached */
 | |
| 	case -ENODATA:	/* page not in cache */
 | |
| 		cifs_dbg(FYI, "%s: %d\n", __func__, ret);
 | |
| 		return 1;
 | |
| 
 | |
| 	default:
 | |
| 		cifs_dbg(VFS, "unknown error ret = %d\n", ret);
 | |
| 	}
 | |
| 	return ret;
 | |
| }
 | |
| 
 | |
| /*
 | |
|  * Retrieve a set of pages from FS-Cache
 | |
|  */
 | |
| int __cifs_readpages_from_fscache(struct inode *inode,
 | |
| 				struct address_space *mapping,
 | |
| 				struct list_head *pages,
 | |
| 				unsigned *nr_pages)
 | |
| {
 | |
| 	int ret;
 | |
| 
 | |
| 	cifs_dbg(FYI, "%s: (0x%p/%u/0x%p)\n",
 | |
| 		 __func__, CIFS_I(inode)->fscache, *nr_pages, inode);
 | |
| 	ret = fscache_read_or_alloc_pages(CIFS_I(inode)->fscache, mapping,
 | |
| 					  pages, nr_pages,
 | |
| 					  cifs_readpage_from_fscache_complete,
 | |
| 					  NULL,
 | |
| 					  mapping_gfp_mask(mapping));
 | |
| 	switch (ret) {
 | |
| 	case 0:	/* read submitted to the cache for all pages */
 | |
| 		cifs_dbg(FYI, "%s: submitted\n", __func__);
 | |
| 		return ret;
 | |
| 
 | |
| 	case -ENOBUFS:	/* some pages are not cached and can't be */
 | |
| 	case -ENODATA:	/* some pages are not cached */
 | |
| 		cifs_dbg(FYI, "%s: no page\n", __func__);
 | |
| 		return 1;
 | |
| 
 | |
| 	default:
 | |
| 		cifs_dbg(FYI, "unknown error ret = %d\n", ret);
 | |
| 	}
 | |
| 
 | |
| 	return ret;
 | |
| }
 | |
| 
 | |
| void __cifs_readpage_to_fscache(struct inode *inode, struct page *page)
 | |
| {
 | |
| 	int ret;
 | |
| 
 | |
| 	cifs_dbg(FYI, "%s: (fsc: %p, p: %p, i: %p)\n",
 | |
| 		 __func__, CIFS_I(inode)->fscache, page, inode);
 | |
| 	ret = fscache_write_page(CIFS_I(inode)->fscache, page, GFP_KERNEL);
 | |
| 	if (ret != 0)
 | |
| 		fscache_uncache_page(CIFS_I(inode)->fscache, page);
 | |
| }
 | |
| 
 | |
| void __cifs_fscache_readpages_cancel(struct inode *inode, struct list_head *pages)
 | |
| {
 | |
| 	cifs_dbg(FYI, "%s: (fsc: %p, i: %p)\n",
 | |
| 		 __func__, CIFS_I(inode)->fscache, inode);
 | |
| 	fscache_readpages_cancel(CIFS_I(inode)->fscache, pages);
 | |
| }
 | |
| 
 | |
| void __cifs_fscache_invalidate_page(struct page *page, struct inode *inode)
 | |
| {
 | |
| 	struct cifsInodeInfo *cifsi = CIFS_I(inode);
 | |
| 	struct fscache_cookie *cookie = cifsi->fscache;
 | |
| 
 | |
| 	cifs_dbg(FYI, "%s: (0x%p/0x%p)\n", __func__, page, cookie);
 | |
| 	fscache_wait_on_page_write(cookie, page);
 | |
| 	fscache_uncache_page(cookie, page);
 | |
| }
 | |
| 
 |