diff options
Diffstat (limited to 'fs/cifs')
-rw-r--r-- | fs/cifs/cifsfs.c | 13 | ||||
-rw-r--r-- | fs/cifs/transport.c | 1 |
2 files changed, 0 insertions, 14 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index 80a93562b47a..09842d3f7e1d 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c | |||
@@ -86,8 +86,6 @@ extern mempool_t *cifs_sm_req_poolp; | |||
86 | extern mempool_t *cifs_req_poolp; | 86 | extern mempool_t *cifs_req_poolp; |
87 | extern mempool_t *cifs_mid_poolp; | 87 | extern mempool_t *cifs_mid_poolp; |
88 | 88 | ||
89 | extern struct kmem_cache *cifs_oplock_cachep; | ||
90 | |||
91 | static int | 89 | static int |
92 | cifs_read_super(struct super_block *sb, void *data, | 90 | cifs_read_super(struct super_block *sb, void *data, |
93 | const char *devname, int silent) | 91 | const char *devname, int silent) |
@@ -289,7 +287,6 @@ static int cifs_permission(struct inode *inode, int mask) | |||
289 | static struct kmem_cache *cifs_inode_cachep; | 287 | static struct kmem_cache *cifs_inode_cachep; |
290 | static struct kmem_cache *cifs_req_cachep; | 288 | static struct kmem_cache *cifs_req_cachep; |
291 | static struct kmem_cache *cifs_mid_cachep; | 289 | static struct kmem_cache *cifs_mid_cachep; |
292 | struct kmem_cache *cifs_oplock_cachep; | ||
293 | static struct kmem_cache *cifs_sm_req_cachep; | 290 | static struct kmem_cache *cifs_sm_req_cachep; |
294 | mempool_t *cifs_sm_req_poolp; | 291 | mempool_t *cifs_sm_req_poolp; |
295 | mempool_t *cifs_req_poolp; | 292 | mempool_t *cifs_req_poolp; |
@@ -939,15 +936,6 @@ cifs_init_mids(void) | |||
939 | return -ENOMEM; | 936 | return -ENOMEM; |
940 | } | 937 | } |
941 | 938 | ||
942 | cifs_oplock_cachep = kmem_cache_create("cifs_oplock_structs", | ||
943 | sizeof(struct oplock_q_entry), 0, | ||
944 | SLAB_HWCACHE_ALIGN, NULL); | ||
945 | if (cifs_oplock_cachep == NULL) { | ||
946 | mempool_destroy(cifs_mid_poolp); | ||
947 | kmem_cache_destroy(cifs_mid_cachep); | ||
948 | return -ENOMEM; | ||
949 | } | ||
950 | |||
951 | return 0; | 939 | return 0; |
952 | } | 940 | } |
953 | 941 | ||
@@ -956,7 +944,6 @@ cifs_destroy_mids(void) | |||
956 | { | 944 | { |
957 | mempool_destroy(cifs_mid_poolp); | 945 | mempool_destroy(cifs_mid_poolp); |
958 | kmem_cache_destroy(cifs_mid_cachep); | 946 | kmem_cache_destroy(cifs_mid_cachep); |
959 | kmem_cache_destroy(cifs_oplock_cachep); | ||
960 | } | 947 | } |
961 | 948 | ||
962 | static int __init | 949 | static int __init |
diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c index 28f563cef5d7..82f78c4d6978 100644 --- a/fs/cifs/transport.c +++ b/fs/cifs/transport.c | |||
@@ -35,7 +35,6 @@ | |||
35 | #include "cifs_debug.h" | 35 | #include "cifs_debug.h" |
36 | 36 | ||
37 | extern mempool_t *cifs_mid_poolp; | 37 | extern mempool_t *cifs_mid_poolp; |
38 | extern struct kmem_cache *cifs_oplock_cachep; | ||
39 | 38 | ||
40 | static struct mid_q_entry * | 39 | static struct mid_q_entry * |
41 | AllocMidQEntry(const struct smb_hdr *smb_buffer, struct TCP_Server_Info *server) | 40 | AllocMidQEntry(const struct smb_hdr *smb_buffer, struct TCP_Server_Info *server) |