[PATCH] smbfs: remove kmalloc wrapper

Remove the remaining kmalloc() wrapper bits from fs/smbfs/. Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] smbfs: remove kmalloc wrapper
Remove the remaining kmalloc() wrapper bits from fs/smbfs/. Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Pekka Enberg · Linus Torvalds
1 parent 44db77f33c
Showing 4 changed files with 12 additions and 81 deletions Side-by-side Diff
fs/smbfs/Makefile
fs/smbfs/inode.c
fs/smbfs/request.c
include/linux/smb_fs.h
@@ -13,7 +13,6 @@
 EXTRA_CFLAGS += -DSMBFS_PARANOIA
 #EXTRA_CFLAGS += -DSMBFS_DEBUG
 #EXTRA_CFLAGS += -DSMBFS_DEBUG_VERBOSE
-#EXTRA_CFLAGS += -DDEBUG_SMB_MALLOC
 #EXTRA_CFLAGS += -DDEBUG_SMB_TIMESTAMP
 #EXTRA_CFLAGS += -Werror
  
@@ -487,11 +487,11 @@
 	if (server->conn_pid)
 		kill_proc(server->conn_pid, SIGTERM, 1);
  
-	smb_kfree(server->ops);
+	kfree(server->ops);
 	smb_unload_nls(server);
 	sb->s_fs_info = NULL;
 	smb_unlock_server(server);
-	smb_kfree(server);
+	kfree(server);
 }
  
 static int smb_fill_super(struct super_block *sb, void *raw_data, int silent)
  
@@ -519,11 +519,10 @@
 	sb->s_op = &smb_sops;
 	sb->s_time_gran = 100;
  
-	server = smb_kmalloc(sizeof(struct smb_sb_info), GFP_KERNEL);
+	server = kzalloc(sizeof(struct smb_sb_info), GFP_KERNEL);
 	if (!server)
 		goto out_no_server;
 	sb->s_fs_info = server;
-	memset(server, 0, sizeof(struct smb_sb_info));
  
 	server->super_block = sb;
 	server->mnt = NULL;
@@ -542,8 +541,8 @@
 	/* FIXME: move these to the smb_sb_info struct */
 	VERBOSE("alloc chunk = %d\n", sizeof(struct smb_ops) +
 		sizeof(struct smb_mount_data_kernel));
-	mem = smb_kmalloc(sizeof(struct smb_ops) +
-			  sizeof(struct smb_mount_data_kernel), GFP_KERNEL);
+	mem = kmalloc(sizeof(struct smb_ops) +
+		      sizeof(struct smb_mount_data_kernel), GFP_KERNEL);
 	if (!mem)
 		goto out_no_mem;
  
  
@@ -621,12 +620,12 @@
 out_no_smbiod:
 	smb_unload_nls(server);
 out_bad_option:
-	smb_kfree(mem);
+	kfree(mem);
 out_no_mem:
 	if (!server->mnt)
 		printk(KERN_ERR "smb_fill_super: allocation failure\n");
 	sb->s_fs_info = NULL;
-	smb_kfree(server);
+	kfree(server);
 	goto out_fail;
 out_wrong_data:
 	printk(KERN_ERR "smbfs: mount_data version %d is not supported\n", ver);
@@ -782,12 +781,6 @@
 	return error;
 }
  
-#ifdef DEBUG_SMB_MALLOC
-int smb_malloced;
-int smb_current_kmalloced;
-int smb_current_vmalloced;
-#endif
-
 static struct super_block *smb_get_sb(struct file_system_type *fs_type,
 	int flags, const char *dev_name, void *data)
 {
@@ -807,12 +800,6 @@
 	int err;
 	DEBUG1("registering ...\n");
  
-#ifdef DEBUG_SMB_MALLOC
-	smb_malloced = 0;
-	smb_current_kmalloced = 0;
-	smb_current_vmalloced = 0;
-#endif
-
 	err = init_inodecache();
 	if (err)
 		goto out_inode;
@@ -837,11 +824,6 @@
 	unregister_filesystem(&smb_fs_type);
 	smb_destroy_request_cache();
 	destroy_inodecache();
-#ifdef DEBUG_SMB_MALLOC
-	printk(KERN_DEBUG "smb_malloced: %d\n", smb_malloced);
-	printk(KERN_DEBUG "smb_current_kmalloced: %d\n",smb_current_kmalloced);
-	printk(KERN_DEBUG "smb_current_vmalloced: %d\n",smb_current_vmalloced);
-#endif
 }
  
 module_init(init_smb_fs)
@@ -68,7 +68,7 @@
 		goto out;
  
 	if (bufsize > 0) {
-		buf = smb_kmalloc(bufsize, GFP_NOFS);
+		buf = kmalloc(bufsize, GFP_NOFS);
 		if (!buf) {
 			kmem_cache_free(req_cachep, req);
 			return NULL;
@@ -124,9 +124,8 @@
 {
 	atomic_dec(&req->rq_server->nr_requests);
 	if (req->rq_buffer && !(req->rq_flags & SMB_REQ_STATIC))
-		smb_kfree(req->rq_buffer);
-	if (req->rq_trans2buffer)
-		smb_kfree(req->rq_trans2buffer);
+		kfree(req->rq_buffer);
+	kfree(req->rq_trans2buffer);
 	kmem_cache_free(req_cachep, req);
 }
  
@@ -183,8 +182,7 @@
 	req->rq_err = 0;
 	req->rq_errno = 0;
 	req->rq_fragment = 0;
-	if (req->rq_trans2buffer)
-		smb_kfree(req->rq_trans2buffer);
+	kfree(req->rq_trans2buffer);
  
 	return 0;
 }
  
@@ -647,10 +645,9 @@
 			goto out_too_long;
  
 		req->rq_trans2bufsize = buf_len;
-		req->rq_trans2buffer = smb_kmalloc(buf_len, GFP_NOFS);
+		req->rq_trans2buffer = kzalloc(buf_len, GFP_NOFS);
 		if (!req->rq_trans2buffer)
 			goto out_no_mem;
-		memset(req->rq_trans2buffer, 0, buf_len);
  
 		req->rq_parm = req->rq_trans2buffer;
 		req->rq_data = req->rq_trans2buffer + parm_tot;
@@ -58,53 +58,6 @@
 /* where to find the base of the SMB packet proper */
 #define smb_base(buf) ((u8 *)(((u8 *)(buf))+4))
  
-#ifdef DEBUG_SMB_MALLOC
-
-#include <linux/slab.h>
-
-extern int smb_malloced;
-extern int smb_current_vmalloced;
-extern int smb_current_kmalloced;
-
-static inline void *
-smb_vmalloc(unsigned int size)
-{
-        smb_malloced += 1;
-        smb_current_vmalloced += 1;
-        return vmalloc(size);
-}
-
-static inline void
-smb_vfree(void *obj)
-{
-        smb_current_vmalloced -= 1;
-        vfree(obj);
-}
-
-static inline void *
-smb_kmalloc(size_t size, int flags)
-{
-	smb_malloced += 1;
-	smb_current_kmalloced += 1;
-	return kmalloc(size, flags);
-}
-
-static inline void
-smb_kfree(void *obj)
-{
-	smb_current_kmalloced -= 1;
-	kfree(obj);
-}
-
-#else /* DEBUG_SMB_MALLOC */
-
-#define smb_kmalloc(s,p)	kmalloc(s,p)
-#define smb_kfree(o)		kfree(o)
-#define smb_vmalloc(s)		vmalloc(s)
-#define smb_vfree(o)		vfree(o)
-
-#endif /* DEBUG_SMB_MALLOC */
-
 /*
  * Flags for the in-memory inode
  */
...	...	@@ -13,7 +13,6 @@
13	13	EXTRA_CFLAGS += -DSMBFS_PARANOIA
14	14	#EXTRA_CFLAGS += -DSMBFS_DEBUG
15	15	#EXTRA_CFLAGS += -DSMBFS_DEBUG_VERBOSE
16		-#EXTRA_CFLAGS += -DDEBUG_SMB_MALLOC
17	16	#EXTRA_CFLAGS += -DDEBUG_SMB_TIMESTAMP
18	17	#EXTRA_CFLAGS += -Werror
19	18
...	...	@@ -487,11 +487,11 @@
487	487	if (server->conn_pid)
488	488	kill_proc(server->conn_pid, SIGTERM, 1);
489	489
490		- smb_kfree(server->ops);
	490	+ kfree(server->ops);
491	491	smb_unload_nls(server);
492	492	sb->s_fs_info = NULL;
493	493	smb_unlock_server(server);
494		- smb_kfree(server);
	494	+ kfree(server);
495	495	}
496	496
497	497	static int smb_fill_super(struct super_block sb, void raw_data, int silent)
498	498
...	...	@@ -519,11 +519,10 @@
519	519	sb->s_op = &smb_sops;
520	520	sb->s_time_gran = 100;
521	521
522		- server = smb_kmalloc(sizeof(struct smb_sb_info), GFP_KERNEL);
	522	+ server = kzalloc(sizeof(struct smb_sb_info), GFP_KERNEL);
523	523	if (!server)
524	524	goto out_no_server;
525	525	sb->s_fs_info = server;
526		- memset(server, 0, sizeof(struct smb_sb_info));
527	526
528	527	server->super_block = sb;
529	528	server->mnt = NULL;
...	...	@@ -542,8 +541,8 @@
542	541	/* FIXME: move these to the smb_sb_info struct */
543	542	VERBOSE("alloc chunk = %d\n", sizeof(struct smb_ops) +
544	543	sizeof(struct smb_mount_data_kernel));
545		- mem = smb_kmalloc(sizeof(struct smb_ops) +
546		- sizeof(struct smb_mount_data_kernel), GFP_KERNEL);
	544	+ mem = kmalloc(sizeof(struct smb_ops) +
	545	+ sizeof(struct smb_mount_data_kernel), GFP_KERNEL);
547	546	if (!mem)
548	547	goto out_no_mem;
549	548
550	549
...	...	@@ -621,12 +620,12 @@
621	620	out_no_smbiod:
622	621	smb_unload_nls(server);
623	622	out_bad_option:
624		- smb_kfree(mem);
	623	+ kfree(mem);
625	624	out_no_mem:
626	625	if (!server->mnt)
627	626	printk(KERN_ERR "smb_fill_super: allocation failure\n");
628	627	sb->s_fs_info = NULL;
629		- smb_kfree(server);
	628	+ kfree(server);
630	629	goto out_fail;
631	630	out_wrong_data:
632	631	printk(KERN_ERR "smbfs: mount_data version %d is not supported\n", ver);
...	...	@@ -782,12 +781,6 @@
782	781	return error;
783	782	}
784	783
785		-#ifdef DEBUG_SMB_MALLOC
786		-int smb_malloced;
787		-int smb_current_kmalloced;
788		-int smb_current_vmalloced;
789		-#endif
790		-
791	784	static struct super_block smb_get_sb(struct file_system_type fs_type,
792	785	int flags, const char dev_name, void data)
793	786	{
...	...	@@ -807,12 +800,6 @@
807	800	int err;
808	801	DEBUG1("registering ...\n");
809	802
810		-#ifdef DEBUG_SMB_MALLOC
811		- smb_malloced = 0;
812		- smb_current_kmalloced = 0;
813		- smb_current_vmalloced = 0;
814		-#endif
815		-
816	803	err = init_inodecache();
817	804	if (err)
818	805	goto out_inode;
...	...	@@ -837,11 +824,6 @@
837	824	unregister_filesystem(&smb_fs_type);
838	825	smb_destroy_request_cache();
839	826	destroy_inodecache();
840		-#ifdef DEBUG_SMB_MALLOC
841		- printk(KERN_DEBUG "smb_malloced: %d\n", smb_malloced);
842		- printk(KERN_DEBUG "smb_current_kmalloced: %d\n",smb_current_kmalloced);
843		- printk(KERN_DEBUG "smb_current_vmalloced: %d\n",smb_current_vmalloced);
844		-#endif
845	827	}
846	828
847	829	module_init(init_smb_fs)
...	...	@@ -68,7 +68,7 @@
68	68	goto out;
69	69
70	70	if (bufsize > 0) {
71		- buf = smb_kmalloc(bufsize, GFP_NOFS);
	71	+ buf = kmalloc(bufsize, GFP_NOFS);
72	72	if (!buf) {
73	73	kmem_cache_free(req_cachep, req);
74	74	return NULL;
...	...	@@ -124,9 +124,8 @@
124	124	{
125	125	atomic_dec(&req->rq_server->nr_requests);
126	126	if (req->rq_buffer && !(req->rq_flags & SMB_REQ_STATIC))
127		- smb_kfree(req->rq_buffer);
128		- if (req->rq_trans2buffer)
129		- smb_kfree(req->rq_trans2buffer);
	127	+ kfree(req->rq_buffer);
	128	+ kfree(req->rq_trans2buffer);
130	129	kmem_cache_free(req_cachep, req);
131	130	}
132	131
...	...	@@ -183,8 +182,7 @@
183	182	req->rq_err = 0;
184	183	req->rq_errno = 0;
185	184	req->rq_fragment = 0;
186		- if (req->rq_trans2buffer)
187		- smb_kfree(req->rq_trans2buffer);
	185	+ kfree(req->rq_trans2buffer);
188	186
189	187	return 0;
190	188	}
191	189
...	...	@@ -647,10 +645,9 @@
647	645	goto out_too_long;
648	646
649	647	req->rq_trans2bufsize = buf_len;
650		- req->rq_trans2buffer = smb_kmalloc(buf_len, GFP_NOFS);
	648	+ req->rq_trans2buffer = kzalloc(buf_len, GFP_NOFS);
651	649	if (!req->rq_trans2buffer)
652	650	goto out_no_mem;
653		- memset(req->rq_trans2buffer, 0, buf_len);
654	651
655	652	req->rq_parm = req->rq_trans2buffer;
656	653	req->rq_data = req->rq_trans2buffer + parm_tot;
...	...	@@ -58,53 +58,6 @@
58	58	/* where to find the base of the SMB packet proper */
59	59	#define smb_base(buf) ((u8 )(((u8 )(buf))+4))
60	60
61		-#ifdef DEBUG_SMB_MALLOC
62		-
63		-#include <linux/slab.h>
64		-
65		-extern int smb_malloced;
66		-extern int smb_current_vmalloced;
67		-extern int smb_current_kmalloced;
68		-
69		-static inline void *
70		-smb_vmalloc(unsigned int size)
71		-{
72		- smb_malloced += 1;
73		- smb_current_vmalloced += 1;
74		- return vmalloc(size);
75		-}
76		-
77		-static inline void
78		-smb_vfree(void *obj)
79		-{
80		- smb_current_vmalloced -= 1;
81		- vfree(obj);
82		-}
83		-
84		-static inline void *
85		-smb_kmalloc(size_t size, int flags)
86		-{
87		- smb_malloced += 1;
88		- smb_current_kmalloced += 1;
89		- return kmalloc(size, flags);
90		-}
91		-
92		-static inline void
93		-smb_kfree(void *obj)
94		-{
95		- smb_current_kmalloced -= 1;
96		- kfree(obj);
97		-}
98		-
99		-#else /* DEBUG_SMB_MALLOC */
100		-
101		-#define smb_kmalloc(s,p) kmalloc(s,p)
102		-#define smb_kfree(o) kfree(o)
103		-#define smb_vmalloc(s) vmalloc(s)
104		-#define smb_vfree(o) vfree(o)
105		-
106		-#endif /* DEBUG_SMB_MALLOC */
107		-
108	61	/*
109	62	* Flags for the in-memory inode
110	63	*/