[Ocfs2-commits] mfasheh commits r1713 - trunk/src
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Tue Dec 21 13:56:06 CST 2004
Author: mfasheh
Date: 2004-12-21 13:56:04 -0600 (Tue, 21 Dec 2004)
New Revision: 1713
Modified:
trunk/src/alloc.c
trunk/src/alloc.h
trunk/src/buffer_head_io.c
trunk/src/buffer_head_io.h
trunk/src/dir.c
trunk/src/dlmglue.c
trunk/src/extent_map.c
trunk/src/file.c
trunk/src/inode.c
trunk/src/journal.c
trunk/src/localalloc.c
trunk/src/namei.c
trunk/src/ocfs_compat.h
trunk/src/ocfs_journal.h
trunk/src/proc.c
trunk/src/suballoc.c
trunk/src/suballoc.h
trunk/src/super.c
trunk/src/sysfile.c
trunk/src/util.c
Log:
* clean up the way we handle "return". nothing much to see here, move
on along.
Modified: trunk/src/alloc.c
===================================================================
--- trunk/src/alloc.c 2004-12-21 19:22:30 UTC (rev 1712)
+++ trunk/src/alloc.c 2004-12-21 19:56:04 UTC (rev 1713)
@@ -145,7 +145,7 @@
brelse(eb_bh);
LOG_EXIT_STATUS(retval);
- return(retval);
+ return retval;
}
/* expects array to already be malloced
@@ -240,7 +240,7 @@
}
}
LOG_EXIT_STATUS(status);
- return(status);
+ return status;
}
/*
@@ -1140,7 +1140,7 @@
else
ocfs2_extent_map_drop(inode, 0);
LOG_EXIT_STATUS(status);
- return(status);
+ return status;
}
/*
Modified: trunk/src/alloc.h
===================================================================
--- trunk/src/alloc.h 2004-12-21 19:22:30 UTC (rev 1712)
+++ trunk/src/alloc.h 2004-12-21 19:56:04 UTC (rev 1713)
@@ -48,7 +48,7 @@
* new tree_depth==0 extent_block, and one block at the new
* top-of-the tree.
*/
- return(fe->id2.i_list.l_tree_depth + 2);
+ return fe->id2.i_list.l_tree_depth + 2;
}
typedef struct _ocfs2_truncate_context {
Modified: trunk/src/buffer_head_io.c
===================================================================
--- trunk/src/buffer_head_io.c 2004-12-21 19:22:30 UTC (rev 1712)
+++ trunk/src/buffer_head_io.c 2004-12-21 19:56:04 UTC (rev 1713)
@@ -58,7 +58,6 @@
unlock_buffer(bh);
// LOG_EXIT();
- return;
}
int ocfs_write_blocks (ocfs_super *osb, struct buffer_head *bhs[],
Modified: trunk/src/buffer_head_io.h
===================================================================
--- trunk/src/buffer_head_io.h 2004-12-21 19:22:30 UTC (rev 1712)
+++ trunk/src/buffer_head_io.h 2004-12-21 19:56:04 UTC (rev 1713)
@@ -143,8 +143,8 @@
int i;
for(i = 0; i < 512; i++)
if ((bh)->b_data[i] != 'P')
- return(0);
- return(1);
+ return 0;
+ return 1;
}
#define OCFS_DO_HEX_DUMP(bh) \
Modified: trunk/src/dir.c
===================================================================
--- trunk/src/dir.c 2004-12-21 19:22:30 UTC (rev 1712)
+++ trunk/src/dir.c 2004-12-21 19:56:04 UTC (rev 1713)
@@ -371,7 +371,7 @@
status = 0;
bail:
LOG_EXIT_STATUS(status);
- return(status);
+ return status;
}
/* assumes you already have a cluster lock on the directory. */
@@ -593,5 +593,5 @@
if (bh)
brelse(bh);
LOG_EXIT_STATUS(status);
- return(status);
+ return status;
}
Modified: trunk/src/dlmglue.c
===================================================================
--- trunk/src/dlmglue.c 2004-12-21 19:22:30 UTC (rev 1712)
+++ trunk/src/dlmglue.c 2004-12-21 19:56:04 UTC (rev 1713)
@@ -292,7 +292,7 @@
*ret = name;
bail:
LOG_EXIT();
- return (len);
+ return len;
}
static void ocfs2_lock_res_init_common(ocfs2_lock_res *res,
Modified: trunk/src/extent_map.c
===================================================================
--- trunk/src/extent_map.c 2004-12-21 19:22:30 UTC (rev 1712)
+++ trunk/src/extent_map.c 2004-12-21 19:56:04 UTC (rev 1713)
@@ -814,8 +814,6 @@
else
*tail_ent = NULL;
}
-
- return;
}
static void __ocfs2_extent_map_drop_cleanup(struct rb_node *free_head)
@@ -910,6 +908,4 @@
void __exit exit_ocfs2_extent_maps(void)
{
kmem_cache_destroy(ocfs2_em_ent_cachep);
-
- return;
}
Modified: trunk/src/file.c
===================================================================
--- trunk/src/file.c 2004-12-21 19:22:30 UTC (rev 1712)
+++ trunk/src/file.c 2004-12-21 19:56:04 UTC (rev 1713)
@@ -893,7 +893,7 @@
leave:
LOG_EXIT_STATUS(status);
- return(status);
+ return status;
}
static unsigned int ocfs_calc_overalloc_bits(ocfs_super *osb,
Modified: trunk/src/inode.c
===================================================================
--- trunk/src/inode.c 2004-12-21 19:22:30 UTC (rev 1712)
+++ trunk/src/inode.c 2004-12-21 19:56:04 UTC (rev 1713)
@@ -159,7 +159,7 @@
LOG_EXIT_PTR(inode);
- return(inode);
+ return inode;
} /* ocfs_iget */
@@ -215,7 +215,7 @@
inode->i_ino = args->ino;
LOG_EXIT_STATUS(0);
- return(0);
+ return 0;
}
#else /* 2.4 kernel stuff */
@@ -792,7 +792,6 @@
LOG_EXIT();
LOG_CLEAR_CONTEXT();
- return;
} /* ocfs_delete_inode */
/*
@@ -965,7 +964,7 @@
LOG_EXIT_STATUS(status);
LOG_CLEAR_CONTEXT();
- return(status);
+ return status;
} /* ocfs_inode_revalidate */
/*
@@ -1016,7 +1015,7 @@
leave:
LOG_EXIT_STATUS(status);
- return(status);
+ return status;
} /* ocfs_mark_inode_dirty */
/*
Modified: trunk/src/journal.c
===================================================================
--- trunk/src/journal.c 2004-12-21 19:22:30 UTC (rev 1712)
+++ trunk/src/journal.c 2004-12-21 19:56:04 UTC (rev 1713)
@@ -213,7 +213,7 @@
retval = kmalloc(sizeof(*retval), GFP_KERNEL);
if (!retval) {
LOG_ERROR_STR("Failed to allocate memory for journal handle!");
- return(NULL);
+ return NULL;
}
memset(retval, 0, sizeof(*retval));
@@ -227,7 +227,7 @@
retval->journal = osb->journal;
retval->osb = osb;
- return(retval);
+ return retval;
}
/* pass it NULL and it will allocate a new handle object for you. If
@@ -279,7 +279,7 @@
handle->flags |= OCFS_HANDLE_STARTED;
LOG_EXIT_PTR(handle);
- return(handle);
+ return handle;
done_free:
@@ -288,7 +288,7 @@
kfree(handle);
}
LOG_EXIT_PTR(NULL);
- return(NULL);
+ return NULL;
} /* ocfs_start_trans */
void ocfs_handle_add_inode(ocfs_journal_handle *handle, struct inode *inode)
@@ -308,8 +308,6 @@
OCFS_I(inode)->ip_handle = handle;
list_del(&(OCFS_I(inode)->ip_handle_list));
list_add_tail(&(OCFS_I(inode)->ip_handle_list), &(handle->inode_list));
-
- return;
}
static void ocfs_handle_unlock_inodes(ocfs_journal_handle *handle)
@@ -328,7 +326,6 @@
up(&inode->i_sem);
iput(inode);
}
- return;
}
/* This for loop is for debug purposes. Basically we want to check the
@@ -364,7 +361,6 @@
kfree(handle);
LOG_EXIT();
- return;
}
/*
@@ -384,7 +380,8 @@
if (!(handle->flags & OCFS_HANDLE_STARTED)) {
ocfs_commit_unstarted_handle(handle);
- goto bail;
+ LOG_EXIT();
+ return;
}
osb = handle->osb;
@@ -417,10 +414,7 @@
handle->k_handle = NULL; /* it's been free'd in journal_stop */
kfree(handle);
-bail:
LOG_EXIT();
-
- return;
} /* ocfs_commit_trans */
/*
@@ -472,7 +466,7 @@
bail:
LOG_EXIT_STATUS(status);
- return(status);
+ return status;
}
/*
@@ -526,7 +520,7 @@
LOG_ERROR_ARGS("Error %d getting %d access to buffer!\n",
status, type);
LOG_EXIT_STATUS(status);
- return(status);
+ return status;
} /* ocfs_journal_access */
/*
@@ -550,7 +544,7 @@
(unsigned long long)bh->b_blocknr);
LOG_EXIT_STATUS(status);
- return(status);
+ return status;
} /* ocfs_journal_dirty */
/* We always assume you're adding a metadata lock at level 'ex' */
@@ -711,7 +705,7 @@
}
LOG_EXIT_STATUS(status);
- return(status);
+ return status;
} /* ocfs_journal_init */
static int ocfs_journal_toggle_dirty(ocfs_super *osb,
@@ -815,7 +809,6 @@
if (inode)
iput(inode);
LOG_EXIT();
- return;
}
int ocfs_journal_load(ocfs_journal *journal)
@@ -871,7 +864,7 @@
done:
LOG_EXIT_STATUS(status);
- return(status);
+ return status;
}
@@ -898,7 +891,7 @@
bail:
LOG_EXIT_STATUS(status);
- return(status);
+ return status;
}
/*
@@ -965,7 +958,7 @@
if (bhs[i])
brelse(bhs[i]);
LOG_EXIT_STATUS(status);
- return(status);
+ return status;
}
static int __ocfs_recovery_thread(void *arg)
@@ -1056,7 +1049,6 @@
wake_up(&osb->recovery_event);
LOG_EXIT();
- return;
}
static int ocfs_recover_node(ocfs_super *osb, int node_num)
@@ -1228,7 +1220,7 @@
#endif
LOG_EXIT_STATUS(status);
- return(status);
+ return status;
}
/* Test node liveness by trylocking his journal. If we get the lock,
@@ -1433,7 +1425,7 @@
if (orphan_dir_inode)
iput(orphan_dir_inode);
- return(status);
+ return status;
}
static int ocfs_wait_on_mount(ocfs_super *osb)
Modified: trunk/src/localalloc.c
===================================================================
--- trunk/src/localalloc.c 2004-12-21 19:22:30 UTC (rev 1712)
+++ trunk/src/localalloc.c 2004-12-21 19:56:04 UTC (rev 1713)
@@ -117,7 +117,7 @@
numbits = 64;
break;
}
- return(numbits);
+ return numbits;
} /* ocfs_local_alloc_window_bits */
int ocfs_alloc_should_use_local(ocfs_super *osb, u64 bits)
@@ -208,7 +208,7 @@
iput(inode);
LOG_EXIT_STATUS(status);
- return(status);
+ return status;
} /* ocfs_load_local_alloc */
/*
@@ -336,7 +336,6 @@
kfree(alloc_copy);
LOG_EXIT();
- return;
} /* ocfs_shutdown_local_alloc */
/*
@@ -403,7 +402,7 @@
iput(inode);
LOG_EXIT_STATUS(status);
- return(status);
+ return status;
} /* ocfs_begin_local_alloc_recovery */
/*
@@ -556,7 +555,7 @@
iput(local_alloc_inode);
LOG_EXIT_STATUS(status);
- return(status);
+ return status;
}
int ocfs_claim_local_alloc_bits(ocfs_super *osb,
@@ -615,7 +614,7 @@
status = 0;
bail:
LOG_EXIT_STATUS(status);
- return(status);
+ return status;
}
/*
@@ -634,7 +633,7 @@
count += hweight8(buffer[i]);
LOG_EXIT_ULONG ((unsigned long)count);
- return(count);
+ return count;
} /* ocfs_local_alloc_count_bits */
/*
@@ -696,7 +695,7 @@
bail:
LOG_EXIT_STATUS(bitoff);
- return(bitoff);
+ return bitoff;
} /* ocfs_local_find_alloc_clear_bits */
/*
@@ -714,7 +713,6 @@
LOCAL_ALLOC(alloc)->la_bitmap[i] = 0;
LOG_EXIT();
- return;
} /* ocfs_clear_local_alloc */
#if 0
@@ -811,7 +809,7 @@
bail:
LOG_EXIT_STATUS(status);
- return(status);
+ return status;
} /* ocfs_sync_local_to_main */
static int ocfs_local_alloc_reserve_for_window(ocfs_super *osb,
@@ -850,7 +848,7 @@
}
LOG_EXIT_STATUS(status);
- return(status);
+ return status;
}
/*
@@ -907,7 +905,7 @@
bail:
LOG_EXIT_STATUS(status);
- return(status);
+ return status;
} /* ocfs_local_alloc_new_window */
/* Note that we do *NOT* lock the local alloc inode here as
@@ -1016,6 +1014,6 @@
ocfs_free_alloc_context(ac);
LOG_EXIT_STATUS(status);
- return(status);
+ return status;
}
Modified: trunk/src/namei.c
===================================================================
--- trunk/src/namei.c 2004-12-21 19:22:30 UTC (rev 1712)
+++ trunk/src/namei.c 2004-12-21 19:56:04 UTC (rev 1713)
@@ -126,9 +126,9 @@
struct buffer_head *parent_fe_bh,
struct buffer_head *insert_bh)
{
- return(__ocfs_add_entry(handle, dentry->d_parent->d_inode,
+ return __ocfs_add_entry(handle, dentry->d_parent->d_inode,
dentry->d_name.name, dentry->d_name.len,
- inode, blkno, parent_fe_bh, insert_bh));
+ inode, blkno, parent_fe_bh, insert_bh);
}
/*
@@ -255,7 +255,7 @@
brelse(new_bh);
LOG_EXIT_STATUS(status);
- return(status);
+ return status;
}
static int ocfs_mknod(struct inode *dir, struct dentry *dentry,
@@ -452,7 +452,7 @@
LOG_EXIT_STATUS(status);
LOG_CLEAR_CONTEXT();
- return(status);
+ return status;
} /* ocfs_mknod */
/*
@@ -977,7 +977,7 @@
}
bail:
LOG_EXIT_STATUS(status);
- return(status);
+ return status;
} /* ocfs_double_lock */
#define PARENT_INO(buffer) \
@@ -1458,7 +1458,7 @@
}
LOG_EXIT_STATUS(status);
- return(status);
+ return status;
} /* ocfs_create_symlink_data */
/*
@@ -1975,7 +1975,7 @@
*retval = name;
bail:
LOG_EXIT_STATUS(namelen);
- return(namelen);
+ return namelen;
}
static int ocfs_prepare_orphan_dir(ocfs_super *osb,
@@ -2036,7 +2036,7 @@
brelse(orphan_dir_bh);
LOG_EXIT_STATUS(status);
- return(status);
+ return status;
}
/*
@@ -2111,7 +2111,7 @@
brelse(orphan_dir_bh);
LOG_EXIT_STATUS(status);
- return(status);
+ return status;
} /* ocfs_orphan_add */
/* unlike orphan_add, we expect the orphan dir to already be locked here. */
Modified: trunk/src/ocfs_compat.h
===================================================================
--- trunk/src/ocfs_compat.h 2004-12-21 19:22:30 UTC (rev 1712)
+++ trunk/src/ocfs_compat.h 2004-12-21 19:56:04 UTC (rev 1713)
@@ -119,7 +119,7 @@
ret = 1;
spin_unlock_irqrestore(¤t->sighand->siglock, flags);
}
- return(ret);
+ return ret;
}
#else
static inline int ocfs_task_interruptible(void)
@@ -134,7 +134,7 @@
ret = 1;
spin_unlock_irqrestore(&(current->sigmask_lock), flags);
}
- return(ret);
+ return ret;
}
static inline void dequeue_signal_lock(struct task_struct *task,
sigset_t *blocked, siginfo_t *info)
@@ -178,7 +178,7 @@
ret = 1;
spin_unlock_irqrestore(¤t->sighand->siglock, flags);
}
- return(ret);
+ return ret;
}
#endif /* LINUX_VERSION_CODE < 2.6 */
Modified: trunk/src/ocfs_journal.h
===================================================================
--- trunk/src/ocfs_journal.h 2004-12-21 19:22:30 UTC (rev 1712)
+++ trunk/src/ocfs_journal.h 2004-12-21 19:56:04 UTC (rev 1713)
@@ -386,7 +386,7 @@
* credit for the dinode there. */
dinode_blocks = 1 + 1 + fe->id2.i_list.l_tree_depth;
- return (bitmap_blocks + sysfile_bitmap_blocks + dinode_blocks);
+ return bitmap_blocks + sysfile_bitmap_blocks + dinode_blocks;
}
static inline int ocfs_calc_symlink_credits(struct super_block *sb)
@@ -397,7 +397,7 @@
* within our single allocated extent. */
blocks += ocfs2_clusters_to_blocks(sb, 1);
- return(blocks);
+ return blocks;
}
static inline int ocfs_calc_group_alloc_credits(struct super_block *sb,
@@ -408,7 +408,7 @@
/* parent inode update + new block group header + bitmap inode update
+ bitmap blocks affected */
blocks = 1 + 1 + 1 + bitmap_blocks;
- return(blocks);
+ return blocks;
}
static inline int ocfs_calc_tree_trunc_credits(struct super_block *sb,
@@ -435,7 +435,7 @@
credits += bitmap_blocks;
- return(credits);
+ return credits;
}
#endif /* _OCFSJOURNAL_H_ */
Modified: trunk/src/proc.c
===================================================================
--- trunk/src/proc.c 2004-12-21 19:22:30 UTC (rev 1712)
+++ trunk/src/proc.c 2004-12-21 19:56:04 UTC (rev 1713)
@@ -126,7 +126,6 @@
}
LOG_EXIT ();
- return ;
} /* ocfs_proc_deinit */
/*
@@ -248,7 +247,7 @@
LOG_EXIT_INT (ret);
- return(ret);
+ return ret;
}
/*
@@ -391,7 +390,6 @@
}
LOG_EXIT ();
- return;
} /* ocfs_proc_remove_volume */
/*
Modified: trunk/src/suballoc.c
===================================================================
--- trunk/src/suballoc.c 2004-12-21 19:22:30 UTC (rev 1712)
+++ trunk/src/suballoc.c 2004-12-21 19:56:04 UTC (rev 1713)
@@ -656,7 +656,7 @@
}
LOG_EXIT_STATUS(status);
- return(status);
+ return status;
}
/*
@@ -1378,7 +1378,7 @@
bail:
LOG_EXIT_STATUS(status);
- return(status);
+ return status;
}
static inline int ocfs_block_group_clear_bits(ocfs_journal_handle *handle,
Modified: trunk/src/suballoc.h
===================================================================
--- trunk/src/suballoc.h 2004-12-21 19:22:30 UTC (rev 1712)
+++ trunk/src/suballoc.h 2004-12-21 19:56:04 UTC (rev 1713)
@@ -54,7 +54,7 @@
void ocfs_free_alloc_context(ocfs2_alloc_context *ac);
static inline int ocfs_alloc_context_bits_left(ocfs2_alloc_context *ac)
{
- return(ac->ac_bits_wanted - ac->ac_bits_given);
+ return ac->ac_bits_wanted - ac->ac_bits_given;
}
int ocfs_reserve_new_metadata(ocfs_super *osb,
Modified: trunk/src/super.c
===================================================================
--- trunk/src/super.c 2004-12-21 19:22:30 UTC (rev 1712)
+++ trunk/src/super.c 2004-12-21 19:56:04 UTC (rev 1713)
@@ -257,7 +257,7 @@
bail:
LOG_EXIT_STATUS(status);
- return(status);
+ return status;
} /* ocfs_init_global_system_inodes */
/*
@@ -284,7 +284,7 @@
bail:
LOG_EXIT_STATUS(status);
- return(status);
+ return status;
} /* ocfs_init_local_system_inodes */
/*
@@ -312,7 +312,7 @@
}
LOG_EXIT_STATUS(status);
- return(status);
+ return status;
} /* ocfs_release_system_inodes */
static int ocfs_fill_super(struct super_block *sb, void *data, int silent)
@@ -631,7 +631,6 @@
printk("Unloaded OCFS Driver module\n");
LOG_EXIT ();
- return;
} /* ocfs_driver_exit */
@@ -652,7 +651,6 @@
LOG_EXIT ();
LOG_CLEAR_CONTEXT();
- return;
} /* ocfs_put_super */
@@ -1534,7 +1532,6 @@
memset (osb, 0, sizeof (ocfs_super));
LOG_EXIT ();
- return;
} /* ocfs_delete_osb */
Modified: trunk/src/sysfile.c
===================================================================
--- trunk/src/sysfile.c 2004-12-21 19:22:30 UTC (rev 1712)
+++ trunk/src/sysfile.c 2004-12-21 19:56:04 UTC (rev 1713)
@@ -53,13 +53,13 @@
static inline int is_global_system_inode(int type)
{
- return (type >= OCFS2_FIRST_ONLINE_SYSTEM_INODE &&
- type <= OCFS2_LAST_GLOBAL_SYSTEM_INODE);
+ return type >= OCFS2_FIRST_ONLINE_SYSTEM_INODE &&
+ type <= OCFS2_LAST_GLOBAL_SYSTEM_INODE;
}
static inline int is_in_system_inode_array(ocfs_super *osb, int type, u32 slot)
{
- return (slot == osb->slot_num || is_global_system_inode(type));
+ return slot == osb->slot_num || is_global_system_inode(type);
}
struct inode *ocfs_get_system_file_inode(ocfs_super *osb, int type,
Modified: trunk/src/util.c
===================================================================
--- trunk/src/util.c 2004-12-21 19:22:30 UTC (rev 1712)
+++ trunk/src/util.c 2004-12-21 19:56:04 UTC (rev 1713)
@@ -103,8 +103,6 @@
sigaddsetmask(&tmpsig, SHUTDOWN_SIGS);
sigprocmask(SIG_UNBLOCK, &tmpsig, NULL);
}
-
- return;
} /* ocfs_daemonize */
#else
void ocfs_daemonize (char *name, int len, int shutdown_sigs)
@@ -123,7 +121,6 @@
ocfs_block_sigs(NULL, SHUTDOWN_SIGS);
else
ocfs_block_sigs(NULL, 0);
- return;
} /* ocfs_daemonize */
#endif
@@ -183,7 +180,7 @@
static int ocfs_kernel_text_address(unsigned long addr)
{
- return (addr >= 0xc0000000 ) ;
+ return addr >= 0xc0000000;
}
void ocfs_show_trace(unsigned long * stack)
More information about the Ocfs2-commits
mailing list