Skip to content

Commit

Permalink
ocfs2: remove unneeded lvb casts
Browse files Browse the repository at this point in the history
dlmglue.c has lots of code which casts the return value of ocfs2_dlm_lvb().
This is pointless however, as ocfs2_dlm_lvb() returns void *.

Signed-off-by: Mark Fasheh <mfasheh@suse.com>
  • Loading branch information
Mark Fasheh committed Jan 5, 2009
1 parent 38d59ef commit a641dc2
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions fs/ocfs2/dlmglue.c
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,7 @@ static void ocfs2_dump_meta_lvb_info(u64 level,
unsigned int line,
struct ocfs2_lock_res *lockres)
{
struct ocfs2_meta_lvb *lvb =
(struct ocfs2_meta_lvb *)ocfs2_dlm_lvb(&lockres->l_lksb);
struct ocfs2_meta_lvb *lvb = ocfs2_dlm_lvb(&lockres->l_lksb);

mlog(level, "LVB information for %s (called from %s:%u):\n",
lockres->l_name, function, line);
Expand Down Expand Up @@ -1864,7 +1863,7 @@ static void __ocfs2_stuff_meta_lvb(struct inode *inode)

mlog_entry_void();

lvb = (struct ocfs2_meta_lvb *)ocfs2_dlm_lvb(&lockres->l_lksb);
lvb = ocfs2_dlm_lvb(&lockres->l_lksb);

/*
* Invalidate the LVB of a deleted inode - this way other
Expand Down Expand Up @@ -1916,7 +1915,7 @@ static void ocfs2_refresh_inode_from_lvb(struct inode *inode)

mlog_meta_lvb(0, lockres);

lvb = (struct ocfs2_meta_lvb *)ocfs2_dlm_lvb(&lockres->l_lksb);
lvb = ocfs2_dlm_lvb(&lockres->l_lksb);

/* We're safe here without the lockres lock... */
spin_lock(&oi->ip_lock);
Expand Down Expand Up @@ -1951,8 +1950,7 @@ static void ocfs2_refresh_inode_from_lvb(struct inode *inode)
static inline int ocfs2_meta_lvb_is_trustable(struct inode *inode,
struct ocfs2_lock_res *lockres)
{
struct ocfs2_meta_lvb *lvb =
(struct ocfs2_meta_lvb *)ocfs2_dlm_lvb(&lockres->l_lksb);
struct ocfs2_meta_lvb *lvb = ocfs2_dlm_lvb(&lockres->l_lksb);

if (lvb->lvb_version == OCFS2_LVB_VERSION
&& be32_to_cpu(lvb->lvb_igeneration) == inode->i_generation)
Expand Down Expand Up @@ -3489,7 +3487,7 @@ static void ocfs2_set_qinfo_lvb(struct ocfs2_lock_res *lockres)

mlog_entry_void();

lvb = (struct ocfs2_qinfo_lvb *)ocfs2_dlm_lvb(&lockres->l_lksb);
lvb = ocfs2_dlm_lvb(&lockres->l_lksb);
lvb->lvb_version = OCFS2_QINFO_LVB_VERSION;
lvb->lvb_bgrace = cpu_to_be32(info->dqi_bgrace);
lvb->lvb_igrace = cpu_to_be32(info->dqi_igrace);
Expand Down

0 comments on commit a641dc2

Please sign in to comment.