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

Commit f579cf3c authored by Suresh Jayaraman's avatar Suresh Jayaraman Committed by Steve French
Browse files

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.

Signed-off-by: default avatarSuresh Jayaraman <sjayaraman@suse.de>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent c21dfb69

fs/cifs/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -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

0 → 100644
+46 −0
Original line number Diff line number Diff line 
/*

 *   fs/cifs/cache.c - CIFS filesystem cache index structure definitions

 *

 *   Copyright (c) 2010 Novell, Inc.

 *   Authors(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"



/*

 * CIFS filesystem definition for FS-Cache

 */

struct fscache_netfs cifs_fscache_netfs = {

	.name = "cifs",

	.version = 0,

};



/*

 * Register CIFS for caching with FS-Cache

 */

int cifs_fscache_register(void)

{

	return fscache_register_netfs(&cifs_fscache_netfs);

}



/*

 * Unregister CIFS for caching

 */

void cifs_fscache_unregister(void)

{

	fscache_unregister_netfs(&cifs_fscache_netfs);

}

fs/cifs/cifsfs.c

+8 −0
Original line number Diff line number Diff line
@@ -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;
@@ -951,6 +956,8 @@ init_cifs(void) 
	cifs_destroy_inodecache();

 out_clean_proc:

	cifs_proc_clean();

	cifs_fscache_unregister();

 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();

	cifs_exit_dns_resolver();

fs/cifs/fscache.h

0 → 100644
+39 −0
Original line number Diff line number Diff line 
/*

 *   fs/cifs/fscache.h - CIFS filesystem cache interface definitions

 *

 *   Copyright (c) 2010 Novell, Inc.

 *   Authors(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

 */

#ifndef _CIFS_FSCACHE_H

#define _CIFS_FSCACHE_H



#include <linux/fscache.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 */