diff options
Diffstat (limited to 'fs/cifs/cifsfs.c')
| -rw-r--r-- | fs/cifs/cifsfs.c | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index c3ef1c0d0e68..22bcf4d7e7ae 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c | |||
| @@ -253,7 +253,6 @@ cifs_alloc_inode(struct super_block *sb) | |||
| 253 | file data or metadata */ | 253 | file data or metadata */ |
| 254 | cifs_inode->clientCanCacheRead = FALSE; | 254 | cifs_inode->clientCanCacheRead = FALSE; |
| 255 | cifs_inode->clientCanCacheAll = FALSE; | 255 | cifs_inode->clientCanCacheAll = FALSE; |
| 256 | cifs_inode->vfs_inode.i_blksize = CIFS_MAX_MSGSIZE; | ||
| 257 | cifs_inode->vfs_inode.i_blkbits = 14; /* 2**14 = CIFS_MAX_MSGSIZE */ | 256 | cifs_inode->vfs_inode.i_blkbits = 14; /* 2**14 = CIFS_MAX_MSGSIZE */ |
| 258 | cifs_inode->vfs_inode.i_flags = S_NOATIME | S_NOCMTIME; | 257 | cifs_inode->vfs_inode.i_flags = S_NOATIME | S_NOCMTIME; |
| 259 | INIT_LIST_HEAD(&cifs_inode->openFileList); | 258 | INIT_LIST_HEAD(&cifs_inode->openFileList); |
| @@ -699,8 +698,7 @@ cifs_init_inodecache(void) | |||
| 699 | static void | 698 | static void |
| 700 | cifs_destroy_inodecache(void) | 699 | cifs_destroy_inodecache(void) |
| 701 | { | 700 | { |
| 702 | if (kmem_cache_destroy(cifs_inode_cachep)) | 701 | kmem_cache_destroy(cifs_inode_cachep); |
| 703 | printk(KERN_WARNING "cifs_inode_cache: error freeing\n"); | ||
| 704 | } | 702 | } |
| 705 | 703 | ||
| 706 | static int | 704 | static int |
| @@ -778,13 +776,9 @@ static void | |||
| 778 | cifs_destroy_request_bufs(void) | 776 | cifs_destroy_request_bufs(void) |
| 779 | { | 777 | { |
| 780 | mempool_destroy(cifs_req_poolp); | 778 | mempool_destroy(cifs_req_poolp); |
| 781 | if (kmem_cache_destroy(cifs_req_cachep)) | 779 | kmem_cache_destroy(cifs_req_cachep); |
| 782 | printk(KERN_WARNING | ||
| 783 | "cifs_destroy_request_cache: error not all structures were freed\n"); | ||
| 784 | mempool_destroy(cifs_sm_req_poolp); | 780 | mempool_destroy(cifs_sm_req_poolp); |
| 785 | if (kmem_cache_destroy(cifs_sm_req_cachep)) | 781 | kmem_cache_destroy(cifs_sm_req_cachep); |
| 786 | printk(KERN_WARNING | ||
| 787 | "cifs_destroy_request_cache: cifs_small_rq free error\n"); | ||
| 788 | } | 782 | } |
| 789 | 783 | ||
| 790 | static int | 784 | static int |
| @@ -819,13 +813,8 @@ static void | |||
| 819 | cifs_destroy_mids(void) | 813 | cifs_destroy_mids(void) |
| 820 | { | 814 | { |
| 821 | mempool_destroy(cifs_mid_poolp); | 815 | mempool_destroy(cifs_mid_poolp); |
| 822 | if (kmem_cache_destroy(cifs_mid_cachep)) | 816 | kmem_cache_destroy(cifs_mid_cachep); |
| 823 | printk(KERN_WARNING | 817 | kmem_cache_destroy(cifs_oplock_cachep); |
| 824 | "cifs_destroy_mids: error not all structures were freed\n"); | ||
| 825 | |||
| 826 | if (kmem_cache_destroy(cifs_oplock_cachep)) | ||
| 827 | printk(KERN_WARNING | ||
| 828 | "error not all oplock structures were freed\n"); | ||
| 829 | } | 818 | } |
| 830 | 819 | ||
| 831 | static int cifs_oplock_thread(void * dummyarg) | 820 | static int cifs_oplock_thread(void * dummyarg) |
