cifs: register CIFS for caching
Subsystems (3)
RFC PATCH 3/10 cifs: register CIFS for caching
Define CIFS for FS-Cache and register for caching. Upon registration the top-level index object cookie will be stuck to the netfs definition by FS-Cache.
--- fs/cifs/Makefile | 2 ++ fs/cifs/cache.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ fs/cifs/cifsfs.c | 8 ++++++++ fs/cifs/fscache.h | 40 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 103 insertions(+), 0 deletions(-) create mode 100644 fs/cifs/cache.c create mode 100644 fs/cifs/fscache.h
fs/cifs/Makefile +2 -0
@@ -11,3 +11,5 @@ cifs-y := cifsfs.o cifssmb.o cifs_debug.o connect.o dir.o file.o inode.o \ cifs-$(CONFIG_CIFS_UPCALL) += cifs_spnego.o cifs-$(CONFIG_CIFS_DFS_UPCALL) += dns_resolve.o cifs_dfs_ref.o + +cifs-$(CONFIG_CIFS_FSCACHE) += cache.o
fs/cifs/cache.c new file +53 -0
53 lines not on this page · raw message
fs/cifs/cifsfs.c +8 -0
@@ -47,6 +47,7 @@#include <linux/key-type.h> #include "dns_resolve.h" #include "cifs_spnego.h" +#include "fscache.h" #define CIFS_MAGIC_NUMBER 0xFF534D42/* the first four bytes of SMB PDUs */ int cifsFYI =0 ;
@@ -902,6 +903,10 @@ init_cifs(void)cFYI (1 ,"cifs_max_pending set to max of 256" ); } + rc =cifs_fscache_register (); +if (rc) + goto out; + rc =cifs_init_inodecache ();if (rc) goto out_clean_proc;
@@ -949,8 +954,10 @@ init_cifs(void)cifs_destroy_mids (); out_destroy_inodecache:cifs_destroy_inodecache (); +cifs_fscache_unregister (); out_clean_proc:cifs_proc_clean (); + out:return rc; }
@@ -959,6 +966,7 @@ exit_cifs(void) {cFYI (DBG2 ,"exit_cifs" );cifs_proc_clean (); +cifs_fscache_unregister ();#ifdef CONFIG_CIFS_DFS_UPCALL cifs_dfs_release_automount_timer ();unregister_key_type (&key_type_dns_resolver);
fs/cifs/fscache.h new file +40 -0
@@ -0,0 +1,40 @@ +/* +* fs/cifs/fscache.h - CIFS filesystem cache interface definitions +* +* Copyright (c) 2010 Novell, Inc. +* Authors(s): Suresh Jayaraman ([email protected]> +* +* 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 +*/ +#ifndef _CIFS_FSCACHE_H +#define _CIFS_FSCACHE_H + +#include <linux/fscache.h> +#include "cifsglob.h" + +#ifdef CONFIG_CIFS_FSCACHE + +extern struct fscache_netfs cifs_fscache_netfs; + +extern int cifs_fscache_register (void ); +extern void cifs_fscache_unregister (void ); + +#else /* CONFIG_CIFS_FSCACHE */ +static inline int cifs_fscache_register (void ) {return 0 ; } +static inline void cifs_fscache_unregister (void ) {} + +#endif /* CONFIG_CIFS_FSCACHE */ + +#endif /* _CIFS_FSCACHE_H */
Signature · 1 line
1.6.4.2
A message that is not in the archive (sent off-list or not yet received): 1277220189-3485-1-git-send-email-sjayaraman-l3A5Bk7waGM@public.gmane.org
fs/cifs/cifsfs.c init_cifs(void) · line 958
Quoted 13 lines · Suresh Jayaraman
fs/cifs/cifsfs.c +5
-0+ rc =cifs_fscache_register (); +if (rc) + goto out; + rc =cifs_init_inodecache ();if (rc) goto out_clean_proc;@@ -949,8 +954,10 @@ init_cifs(void)cifs_destroy_mids (); out_destroy_inodecache:cifs_destroy_inodecache (); +cifs_fscache_unregister (); out_clean_proc:
This is incorrect. You need to call cifs_fscache_unregister() if cifs_init_inodecache() fails.
David
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 19 lines · David Howells
fs/cifs/cifsfs.c init_cifs(void) · line 958
Quoted 13 lines · Suresh Jayaraman
fs/cifs/cifsfs.c +5
-0+ rc =cifs_fscache_register (); +if (rc) + goto out; + rc =cifs_init_inodecache ();if (rc) goto out_clean_proc;@@ -949,8 +954,10 @@ init_cifs(void)cifs_destroy_mids (); out_destroy_inodecache:cifs_destroy_inodecache (); +cifs_fscache_unregister (); out_clean_proc:This is incorrect. You need to call
cifs_fscache_unregister()ifcifs_init_inodecache()fails.
Doh! I'll fix it.
Signature · 1 line
Suresh Jayaraman