diff options
Diffstat (limited to 'fs/smbfs')
| -rw-r--r-- | fs/smbfs/inode.c | 3 | ||||
| -rw-r--r-- | fs/smbfs/request.c | 8 | ||||
| -rw-r--r-- | fs/smbfs/smbiod.c | 3 | ||||
| -rw-r--r-- | fs/smbfs/sock.c | 1 | ||||
| -rw-r--r-- | fs/smbfs/symlink.c | 1 |
5 files changed, 5 insertions, 11 deletions
diff --git a/fs/smbfs/inode.c b/fs/smbfs/inode.c index 5faba4f1c9a..424a3ddf86d 100644 --- a/fs/smbfs/inode.c +++ b/fs/smbfs/inode.c @@ -69,9 +69,8 @@ static void smb_destroy_inode(struct inode *inode) static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flags) { struct smb_inode_info *ei = (struct smb_inode_info *) foo; - unsigned long flagmask = SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR; - if ((flags & flagmask) == SLAB_CTOR_CONSTRUCTOR) + if (flags & SLAB_CTOR_CONSTRUCTOR) inode_init_once(&ei->vfs_inode); } diff --git a/fs/smbfs/request.c b/fs/smbfs/request.c index 42261dbdf60..c288fbe7953 100644 --- a/fs/smbfs/request.c +++ b/fs/smbfs/request.c @@ -6,6 +6,7 @@ * Please add a note about your changes to smbfs in the ChangeLog file. */ +#include <linux/kernel.h> #include <linux/types.h> #include <linux/fs.h> #include <linux/slab.h> @@ -22,8 +23,6 @@ /* #define SMB_SLAB_DEBUG (SLAB_RED_ZONE | SLAB_POISON) */ #define SMB_SLAB_DEBUG 0 -#define ROUND_UP(x) (((x)+3) & ~3) - /* cache for request structures */ static struct kmem_cache *req_cachep; @@ -181,6 +180,7 @@ static int smb_setup_request(struct smb_request *req) req->rq_errno = 0; req->rq_fragment = 0; kfree(req->rq_trans2buffer); + req->rq_trans2buffer = NULL; return 0; } @@ -199,8 +199,8 @@ static int smb_setup_trans2request(struct smb_request *req) const int smb_parameters = 15; const int header = SMB_HEADER_LEN + 2 * smb_parameters + 2; - const int oparam = ROUND_UP(header + 3); - const int odata = ROUND_UP(oparam + req->rq_lparm); + const int oparam = ALIGN(header + 3, sizeof(u32)); + const int odata = ALIGN(oparam + req->rq_lparm, sizeof(u32)); const int bcc = (req->rq_data ? odata + req->rq_ldata : oparam + req->rq_lparm) - header; diff --git a/fs/smbfs/smbiod.c b/fs/smbfs/smbiod.c index 89eaf31f1d4..67176af8515 100644 --- a/fs/smbfs/smbiod.c +++ b/fs/smbfs/smbiod.c @@ -16,7 +16,6 @@ #include <linux/init.h> #include <linux/file.h> #include <linux/dcache.h> -#include <linux/smp_lock.h> #include <linux/module.h> #include <linux/net.h> #include <linux/kthread.h> @@ -299,8 +298,6 @@ out: */ static int smbiod(void *unused) { - allow_signal(SIGKILL); - VERBOSE("SMB Kernel thread starting (%d) ...\n", current->pid); for (;;) { diff --git a/fs/smbfs/sock.c b/fs/smbfs/sock.c index 92ea6b2367d..e48bd8235a8 100644 --- a/fs/smbfs/sock.c +++ b/fs/smbfs/sock.c @@ -17,7 +17,6 @@ #include <linux/net.h> #include <linux/mm.h> #include <linux/netdevice.h> -#include <linux/smp_lock.h> #include <linux/workqueue.h> #include <net/scm.h> #include <net/tcp_states.h> diff --git a/fs/smbfs/symlink.c b/fs/smbfs/symlink.c index fea20ceb8a5..00b2909bd46 100644 --- a/fs/smbfs/symlink.c +++ b/fs/smbfs/symlink.c @@ -13,7 +13,6 @@ #include <linux/mm.h> #include <linux/slab.h> #include <linux/pagemap.h> -#include <linux/smp_lock.h> #include <linux/net.h> #include <linux/namei.h> |