diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-24 17:46:54 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-24 17:46:54 (GMT) |
| commit | 5394cd218735bf462e72bb827fbb7e47fc15f2f0 (patch) | |
| tree | bdbc64d378a015fd921d2adc1cac49752f3121f1 /fs/cifs/misc.c | |
| parent | 6f3776c9cd03998f0e6d11774a03aa1788b4e463 (diff) | |
| parent | 8e6f195af0e1f226e9b2e0256af8df46adb9d595 (diff) | |
| download | linux-fsl-qoriq-5394cd218735bf462e72bb827fbb7e47fc15f2f0.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
[CIFS] Fix oops when Windows server sent bad domain name null terminator
[CIFS] cifs sprintf fix
[CIFS] Remove 2 unneeded kzalloc casts
[CIFS] Update CIFS version number
Diffstat (limited to 'fs/cifs/misc.c')
| -rw-r--r-- | fs/cifs/misc.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c index aedf683..19cc294 100644 --- a/fs/cifs/misc.c +++ b/fs/cifs/misc.c @@ -71,9 +71,7 @@ sesInfoAlloc(void) { struct cifsSesInfo *ret_buf; - ret_buf = - (struct cifsSesInfo *) kzalloc(sizeof (struct cifsSesInfo), - GFP_KERNEL); + ret_buf = kzalloc(sizeof (struct cifsSesInfo), GFP_KERNEL); if (ret_buf) { write_lock(&GlobalSMBSeslock); atomic_inc(&sesInfoAllocCount); @@ -109,9 +107,7 @@ struct cifsTconInfo * tconInfoAlloc(void) { struct cifsTconInfo *ret_buf; - ret_buf = - (struct cifsTconInfo *) kzalloc(sizeof (struct cifsTconInfo), - GFP_KERNEL); + ret_buf = kzalloc(sizeof (struct cifsTconInfo), GFP_KERNEL); if (ret_buf) { write_lock(&GlobalSMBSeslock); atomic_inc(&tconInfoAllocCount); |