diff options
author | Suresh Jayaraman <sjayaraman@suse.de> | 2010-07-05 08:41:50 -0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2010-08-02 08:40:33 -0400 |
commit | f579cf3cfd1e19ae5aab6929679d0c04bf1a6284 (patch) | |
tree | 19773895c06b9f3a251745f9c449051e4e0934c1 /fs/cifs/cifsfs.c | |
parent | c21dfb699f35b6b5508fb808bb0ca211a865f2c9 (diff) |
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: Suresh Jayaraman <sjayaraman@suse.de>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/cifsfs.c')
-rw-r--r-- | fs/cifs/cifsfs.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index 2cb1a70214d7..24d7f4ab3b65 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c | |||
@@ -47,6 +47,7 @@ | |||
47 | #include <linux/key-type.h> | 47 | #include <linux/key-type.h> |
48 | #include "dns_resolve.h" | 48 | #include "dns_resolve.h" |
49 | #include "cifs_spnego.h" | 49 | #include "cifs_spnego.h" |
50 | #include "fscache.h" | ||
50 | #define CIFS_MAGIC_NUMBER 0xFF534D42 /* the first four bytes of SMB PDUs */ | 51 | #define CIFS_MAGIC_NUMBER 0xFF534D42 /* the first four bytes of SMB PDUs */ |
51 | 52 | ||
52 | int cifsFYI = 0; | 53 | int cifsFYI = 0; |
@@ -902,6 +903,10 @@ init_cifs(void) | |||
902 | cFYI(1, "cifs_max_pending set to max of 256"); | 903 | cFYI(1, "cifs_max_pending set to max of 256"); |
903 | } | 904 | } |
904 | 905 | ||
906 | rc = cifs_fscache_register(); | ||
907 | if (rc) | ||
908 | goto out; | ||
909 | |||
905 | rc = cifs_init_inodecache(); | 910 | rc = cifs_init_inodecache(); |
906 | if (rc) | 911 | if (rc) |
907 | goto out_clean_proc; | 912 | goto out_clean_proc; |
@@ -951,6 +956,8 @@ init_cifs(void) | |||
951 | cifs_destroy_inodecache(); | 956 | cifs_destroy_inodecache(); |
952 | out_clean_proc: | 957 | out_clean_proc: |
953 | cifs_proc_clean(); | 958 | cifs_proc_clean(); |
959 | cifs_fscache_unregister(); | ||
960 | out: | ||
954 | return rc; | 961 | return rc; |
955 | } | 962 | } |
956 | 963 | ||
@@ -959,6 +966,7 @@ exit_cifs(void) | |||
959 | { | 966 | { |
960 | cFYI(DBG2, "exit_cifs"); | 967 | cFYI(DBG2, "exit_cifs"); |
961 | cifs_proc_clean(); | 968 | cifs_proc_clean(); |
969 | cifs_fscache_unregister(); | ||
962 | #ifdef CONFIG_CIFS_DFS_UPCALL | 970 | #ifdef CONFIG_CIFS_DFS_UPCALL |
963 | cifs_dfs_release_automount_timer(); | 971 | cifs_dfs_release_automount_timer(); |
964 | cifs_exit_dns_resolver(); | 972 | cifs_exit_dns_resolver(); |