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

Commit 8ec442ae authored by David Howells's avatar David Howells
Browse files

NFS: Register NFS for caching and retrieve the top-level index 



Register NFS for caching and retrieve the top-level cache index object cookie.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Acked-by: default avatarSteve Dickson <steved@redhat.com>
Acked-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
Acked-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Tested-by: default avatarDaire Byrne <Daire.Byrne@framestore.com>
parent 3b9ce977

fs/nfs/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -15,3 +15,4 @@ nfs-$(CONFIG_NFS_V4) += nfs4proc.o nfs4xdr.o nfs4state.o nfs4renewd.o \ 
			   callback.o callback_xdr.o callback_proc.o \

			   nfs4namespace.o

nfs-$(CONFIG_SYSCTL) += sysctl.o

nfs-$(CONFIG_NFS_FSCACHE) += fscache-index.o

fs/nfs/fscache-index.c

0 → 100644
+49 −0
Original line number Diff line number Diff line 
/* NFS FS-Cache index structure definition

 *

 * Copyright (C) 2008 Red Hat, Inc. All Rights Reserved.

 * Written by David Howells (dhowells@redhat.com)

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public Licence

 * as published by the Free Software Foundation; either version

 * 2 of the Licence, or (at your option) any later version.

 */



#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/sched.h>

#include <linux/mm.h>

#include <linux/nfs_fs.h>

#include <linux/nfs_fs_sb.h>

#include <linux/in6.h>



#include "internal.h"

#include "fscache.h"



#define NFSDBG_FACILITY		NFSDBG_FSCACHE



/*

 * Define the NFS filesystem for FS-Cache.  Upon registration FS-Cache sticks

 * the cookie for the top-level index object for NFS into here.  The top-level

 * index can than have other cache objects inserted into it.

 */

struct fscache_netfs nfs_fscache_netfs = {

	.name		= "nfs",

	.version	= 0,

};



/*

 * Register NFS for caching

 */

int nfs_fscache_register(void)

{

	return fscache_register_netfs(&nfs_fscache_netfs);

}



/*

 * Unregister NFS for caching

 */

void nfs_fscache_unregister(void)

{

	fscache_unregister_netfs(&nfs_fscache_netfs);

}

fs/nfs/fscache.h

0 → 100644
+35 −0
Original line number Diff line number Diff line 
/* NFS filesystem cache interface definitions

 *

 * Copyright (C) 2008 Red Hat, Inc. All Rights Reserved.

 * Written by David Howells (dhowells@redhat.com)

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public Licence

 * as published by the Free Software Foundation; either version

 * 2 of the Licence, or (at your option) any later version.

 */



#ifndef _NFS_FSCACHE_H

#define _NFS_FSCACHE_H



#include <linux/nfs_fs.h>

#include <linux/nfs_mount.h>

#include <linux/nfs4_mount.h>

#include <linux/fscache.h>



#ifdef CONFIG_NFS_FSCACHE



/*

 * fscache-index.c

 */

extern struct fscache_netfs nfs_fscache_netfs;



extern int nfs_fscache_register(void);

extern void nfs_fscache_unregister(void);



#else /* CONFIG_NFS_FSCACHE */

static inline int nfs_fscache_register(void) { return 0; }

static inline void nfs_fscache_unregister(void) {}



#endif /* CONFIG_NFS_FSCACHE */

#endif /* _NFS_FSCACHE_H */

fs/nfs/inode.c

+8 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#include "delegation.h"

#include "iostat.h"

#include "internal.h"

#include "fscache.h"



#define NFSDBG_FACILITY		NFSDBG_VFS
@@ -1436,6 +1437,10 @@ static int __init init_nfs_fs(void) 
{

	int err;



	err = nfs_fscache_register();

	if (err < 0)

		goto out7;



	err = nfsiod_start();

	if (err)

		goto out6;
@@ -1488,6 +1493,8 @@ out4: 
out5:

	nfsiod_stop();

out6:

	nfs_fscache_unregister();

out7:

	return err;

}
@@ -1498,6 +1505,7 @@ static void __exit exit_nfs_fs(void) 
	nfs_destroy_readpagecache();

	nfs_destroy_inodecache();

	nfs_destroy_nfspagecache();

	nfs_fscache_unregister();

#ifdef CONFIG_PROC_FS

	rpc_proc_unregister("nfs");

#endif