diff options
Diffstat (limited to 'drivers/staging/pohmelfs')
-rw-r--r-- | drivers/staging/pohmelfs/config.c | 10 | ||||
-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, 10 insertions, 13 deletions
diff --git a/drivers/staging/pohmelfs/config.c b/drivers/staging/pohmelfs/config.c index 89279ba1b737..b6c42cb0d1c6 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. */ @@ -525,7 +525,7 @@ static void pohmelfs_cn_callback(struct cn_msg *msg, struct netlink_skb_parms *n { int err; - if (!cap_raised(nsp->eff_cap, CAP_SYS_ADMIN)) + if (!cap_raised(current_cap(), CAP_SYS_ADMIN)) return; switch (msg->flags) { @@ -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 059e9d2ddf6b..9732a9666cc4 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 56d3a4e5622f..c93ef207b0b4 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 63391d2c25a4..985b6b755d5d 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, |