summaryrefslogtreecommitdiff
path: root/drivers/staging/pohmelfs
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2009-04-22 08:59:15 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-06-19 11:00:39 -0700
commitdc8284611bf7ee2e871919fa441a9c7afe4d5486 (patch)
treee042fe8044ec1e988562e373b5f8023df92aaa25 /drivers/staging/pohmelfs
parent3bafeab78116bb58be3cafb06b401b2973a71ed4 (diff)
Staging: pohmelfs: Remove braces around single statements
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Cc: Evgeniy Polyakov <zbr@ioremap.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/pohmelfs')
-rw-r--r--drivers/staging/pohmelfs/dir.c7
-rw-r--r--drivers/staging/pohmelfs/inode.c7
-rw-r--r--drivers/staging/pohmelfs/net.c4
-rw-r--r--drivers/staging/pohmelfs/trans.c4
4 files changed, 10 insertions, 12 deletions
diff --git a/drivers/staging/pohmelfs/dir.c b/drivers/staging/pohmelfs/dir.c
index 71210b1c86c9..4c58e22c1fbe 100644
--- a/drivers/staging/pohmelfs/dir.c
+++ b/drivers/staging/pohmelfs/dir.c
@@ -692,9 +692,9 @@ static int pohmelfs_remove_entry(struct inode *dir, struct dentry *dentry)
n = pohmelfs_search_hash(parent, str.hash);
if (n) {
pohmelfs_fix_offset(parent, n);
- if (test_bit(NETFS_INODE_REMOTE_SYNCED, &pi->state)) {
+ if (test_bit(NETFS_INODE_REMOTE_SYNCED, &pi->state))
pohmelfs_remove_child(pi, n);
- }
+
pohmelfs_name_free(parent, n);
err = 0;
}
@@ -1006,9 +1006,8 @@ static int pohmelfs_rename(struct inode *old_dir, struct dentry *old_dentry,
pi = POHMELFS_I(inode);
old_parent = POHMELFS_I(old_dir);
- if (new_dir) {
+ if (new_dir)
new_dir->i_sb->s_op->write_inode(new_dir, 0);
- }
old_hash = jhash(old_dentry->d_name.name, old_dentry->d_name.len, 0);
str.hash = jhash(new_dentry->d_name.name, new_dentry->d_name.len, 0);
diff --git a/drivers/staging/pohmelfs/inode.c b/drivers/staging/pohmelfs/inode.c
index 6256c5c7a5ad..882c619c01d0 100644
--- a/drivers/staging/pohmelfs/inode.c
+++ b/drivers/staging/pohmelfs/inode.c
@@ -1529,9 +1529,9 @@ static void pohmelfs_drop_scan(struct work_struct *work)
struct pohmelfs_inode *pi;
unsigned int count = 0;
- while ((pi = pohmelfs_get_inode_from_list(psb, &psb->drop_list, &count))) {
+ while ((pi = pohmelfs_get_inode_from_list(psb, &psb->drop_list, &count)))
pohmelfs_put_inode_count(pi, count);
- }
+
pohmelfs_check_states(psb);
if (psb->drop_scan_timeout)
@@ -1568,9 +1568,8 @@ static void pohmelfs_trans_scan_state(struct netfs_state *st)
rb_node = rb_next(rb_node);
err = -ETIMEDOUT;
- if (timeout && (++dst->retries < psb->trans_retries)) {
+ if (timeout && (++dst->retries < psb->trans_retries))
err = netfs_trans_resend(t, psb);
- }
if (err || (t->flags & NETFS_TRANS_SINGLE_DST)) {
if (netfs_trans_remove_nolock(dst, st))
diff --git a/drivers/staging/pohmelfs/net.c b/drivers/staging/pohmelfs/net.c
index 3d1c0bc5558d..5f312c91aab6 100644
--- a/drivers/staging/pohmelfs/net.c
+++ b/drivers/staging/pohmelfs/net.c
@@ -914,9 +914,9 @@ static int pohmelfs_recv(void *data)
unsigned char *hash = e->data;
dprintk("%s: received hash: ", __func__);
- for (i=0; i<cmd->csize; ++i) {
+ for (i=0; i<cmd->csize; ++i)
printk("%02x ", hash[i]);
- }
+
printk("\n");
}
#endif
diff --git a/drivers/staging/pohmelfs/trans.c b/drivers/staging/pohmelfs/trans.c
index 2a4568d58012..4587f6d546aa 100644
--- a/drivers/staging/pohmelfs/trans.c
+++ b/drivers/staging/pohmelfs/trans.c
@@ -178,9 +178,9 @@ int netfs_trans_send(struct netfs_trans *t, struct netfs_state *st)
err_out_unlock_return:
- if (st->need_reset) {
+ if (st->need_reset)
netfs_state_exit(st);
- }
+
netfs_state_unlock_send(st);
dprintk("%s: t: %p, gen: %u, err: %d.\n",