diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-06-12 22:34:34 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-06-12 22:34:34 -0400 |
| commit | b232923966f1210e1183353bbd1d52ee53b79fbf (patch) | |
| tree | e90c72b2cb400af53e1f92aff0af122782d7f65c /fs/cifs/cifsfs.c | |
| parent | bca1a5518cab2d58c766863c61ee4ef5f1cc4caa (diff) | |
| parent | 99f9f3d49cbc7d944476f6fde53a77ec789ab2aa (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'fs/cifs/cifsfs.c')
| -rw-r--r-- | fs/cifs/cifsfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index d38c69b591c..7c04752b76c 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@ -825,8 +825,8 @@ cifs_init_mids(void) sizeof (struct oplock_q_entry), 0, SLAB_HWCACHE_ALIGN, NULL, NULL); if (cifs_oplock_cachep == NULL) { - kmem_cache_destroy(cifs_mid_cachep); mempool_destroy(cifs_mid_poolp); + kmem_cache_destroy(cifs_mid_cachep); return -ENOMEM; } |