diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 15:19:35 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 15:19:35 -0700 |
commit | 6445ced8670f37cfc2c5e24a9de9b413dbfc788d (patch) | |
tree | 7c98481159008a4080cda929ea8c7bc7598a2c39 /drivers/staging/pohmelfs | |
parent | e6bee325e49f17c65c1fd66e9e8b348c85788341 (diff) | |
parent | 12bb12fac06d6212be9a5ed282c5670d4e90747f (diff) | |
download | kernel_samsung_smdk4412-6445ced8670f37cfc2c5e24a9de9b413dbfc788d.zip kernel_samsung_smdk4412-6445ced8670f37cfc2c5e24a9de9b413dbfc788d.tar.gz kernel_samsung_smdk4412-6445ced8670f37cfc2c5e24a9de9b413dbfc788d.tar.bz2 |
Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (961 commits)
staging: hv: fix memory leaks
staging: hv: Remove NULL check before kfree
Staging: hv: Get rid of vmbus_child_dev_add()
Staging: hv: Change the signature for vmbus_child_device_register()
Staging: hv: Get rid of vmbus_cleanup() function
Staging: hv: Get rid of vmbus_dev_rm() function
Staging: hv: Change the signature for vmbus_on_isr()
Staging: hv: Eliminate vmbus_event_dpc()
Staging: hv: Get rid of the function vmbus_msg_dpc()
Staging: hv: Change the signature for vmbus_cleanup()
Staging: hv: Simplify root device management
staging: rtl8192e: Don't copy dev pointer to skb
staging: rtl8192e: Pass priv to cmdpkt functions
staging: rtl8192e: Pass priv to firmware download functions
staging: rtl8192e: Pass priv to rtl8192_interrupt
staging: rtl8192e: Pass rtl8192_priv to dm functions
staging: rtl8192e: Pass ieee80211_device to callbacks
staging: rtl8192e: Pass ieee80211_device to callbacks
staging: rtl8192e: Pass ieee80211_device to callbacks
staging: rtl8192e: Pass ieee80211_device to callbacks
...
Diffstat (limited to 'drivers/staging/pohmelfs')
-rw-r--r-- | drivers/staging/pohmelfs/config.c | 8 | ||||
-rw-r--r-- | drivers/staging/pohmelfs/dir.c | 1 | ||||
-rw-r--r-- | drivers/staging/pohmelfs/inode.c | 10 | ||||
-rw-r--r-- | drivers/staging/pohmelfs/netfs.h | 2 |
4 files changed, 9 insertions, 12 deletions
diff --git a/drivers/staging/pohmelfs/config.c b/drivers/staging/pohmelfs/config.c index 89279ba..a9a3e25 100644 --- a/drivers/staging/pohmelfs/config.c +++ b/drivers/staging/pohmelfs/config.c @@ -134,7 +134,7 @@ int pohmelfs_copy_config(struct pohmelfs_sb *psb) goto out_unlock; /* - * Run over all entries in given config group and try to crate and + * Run over all entries in given config group and try to create and * initialize those, which do not exist in superblock list. * Skip all existing entries. */ @@ -601,11 +601,9 @@ void pohmelfs_config_exit(void) list_del(&g->group_entry); - if (g->hash_string) - kfree(g->hash_string); + kfree(g->hash_string); - if (g->cipher_string) - kfree(g->cipher_string); + kfree(g->cipher_string); kfree(g); } diff --git a/drivers/staging/pohmelfs/dir.c b/drivers/staging/pohmelfs/dir.c index 059e9d2..9732a96 100644 --- a/drivers/staging/pohmelfs/dir.c +++ b/drivers/staging/pohmelfs/dir.c @@ -1082,7 +1082,6 @@ err_out_exit: clear_bit(NETFS_INODE_REMOTE_SYNCED, &pi->state); - mutex_unlock(&inode->i_mutex); return err; } diff --git a/drivers/staging/pohmelfs/inode.c b/drivers/staging/pohmelfs/inode.c index 56d3a4e..c93ef207 100644 --- a/drivers/staging/pohmelfs/inode.c +++ b/drivers/staging/pohmelfs/inode.c @@ -834,7 +834,7 @@ static void pohmelfs_i_callback(struct rcu_head *head) } /* - * ->detroy_inode() callback. Deletes inode from the caches + * ->destroy_inode() callback. Deletes inode from the caches * and frees private data. */ static void pohmelfs_destroy_inode(struct inode *inode) @@ -1127,18 +1127,18 @@ static ssize_t pohmelfs_getxattr(struct dentry *dentry, const char *name, /* * This loop is a bit ugly, since it waits until reference counter - * hits 1 and then put object here. Main goal is to prevent race with - * network thread, when it can start processing given request, i.e. + * hits 1 and then puts the object here. Main goal is to prevent race with + * the network thread, when it can start processing the given request, i.e. * increase its reference counter but yet not complete it, while * we will exit from ->getxattr() with timeout, and although request * will not be freed (its reference counter was increased by network * thread), data pointer provided by user may be released, so we will - * overwrite already freed area in network thread. + * overwrite an already freed area in the network thread. * * Now after timeout we remove request from the cache, so it can not be * found by network thread, and wait for its reference counter to hit 1, * i.e. if network thread already started to process this request, we wait - * it to finish, and then free object locally. If reference counter is + * for it to finish, and then free object locally. If reference counter is * already 1, i.e. request is not used by anyone else, we can free it without * problem. */ diff --git a/drivers/staging/pohmelfs/netfs.h b/drivers/staging/pohmelfs/netfs.h index 63391d2..985b6b7 100644 --- a/drivers/staging/pohmelfs/netfs.h +++ b/drivers/staging/pohmelfs/netfs.h @@ -191,7 +191,7 @@ enum { /* * POHMELFS capabilities: information about supported * crypto operations (hash/cipher, modes, key sizes and so on), - * root informaion (used/available size, number of objects, permissions) + * root information (used/available size, number of objects, permissions) */ enum pohmelfs_capabilities { POHMELFS_CRYPTO_CAPABILITIES = 0, |