diff options
author | David Howells <dhowells@redhat.com> | 2009-04-03 11:42:42 -0400 |
---|---|---|
committer | David Howells <dhowells@redhat.com> | 2009-04-03 11:42:42 -0400 |
commit | 8ec442ae4c6577ed181682e534d4eef524e30b3c (patch) | |
tree | 44fb9013929f7227781525d1904ac16d6723ce6e /fs/nfs/inode.c | |
parent | 3b9ce977b2f31b6c396b6fb620df9881a30fac9d (diff) |
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: David Howells <dhowells@redhat.com>
Acked-by: Steve Dickson <steved@redhat.com>
Acked-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Tested-by: Daire Byrne <Daire.Byrne@framestore.com>
Diffstat (limited to 'fs/nfs/inode.c')
-rw-r--r-- | fs/nfs/inode.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index a834d1d850b7..cd29f410e941 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c | |||
@@ -46,6 +46,7 @@ | |||
46 | #include "delegation.h" | 46 | #include "delegation.h" |
47 | #include "iostat.h" | 47 | #include "iostat.h" |
48 | #include "internal.h" | 48 | #include "internal.h" |
49 | #include "fscache.h" | ||
49 | 50 | ||
50 | #define NFSDBG_FACILITY NFSDBG_VFS | 51 | #define NFSDBG_FACILITY NFSDBG_VFS |
51 | 52 | ||
@@ -1436,6 +1437,10 @@ static int __init init_nfs_fs(void) | |||
1436 | { | 1437 | { |
1437 | int err; | 1438 | int err; |
1438 | 1439 | ||
1440 | err = nfs_fscache_register(); | ||
1441 | if (err < 0) | ||
1442 | goto out7; | ||
1443 | |||
1439 | err = nfsiod_start(); | 1444 | err = nfsiod_start(); |
1440 | if (err) | 1445 | if (err) |
1441 | goto out6; | 1446 | goto out6; |
@@ -1488,6 +1493,8 @@ out4: | |||
1488 | out5: | 1493 | out5: |
1489 | nfsiod_stop(); | 1494 | nfsiod_stop(); |
1490 | out6: | 1495 | out6: |
1496 | nfs_fscache_unregister(); | ||
1497 | out7: | ||
1491 | return err; | 1498 | return err; |
1492 | } | 1499 | } |
1493 | 1500 | ||
@@ -1498,6 +1505,7 @@ static void __exit exit_nfs_fs(void) | |||
1498 | nfs_destroy_readpagecache(); | 1505 | nfs_destroy_readpagecache(); |
1499 | nfs_destroy_inodecache(); | 1506 | nfs_destroy_inodecache(); |
1500 | nfs_destroy_nfspagecache(); | 1507 | nfs_destroy_nfspagecache(); |
1508 | nfs_fscache_unregister(); | ||
1501 | #ifdef CONFIG_PROC_FS | 1509 | #ifdef CONFIG_PROC_FS |
1502 | rpc_proc_unregister("nfs"); | 1510 | rpc_proc_unregister("nfs"); |
1503 | #endif | 1511 | #endif |