Came across this while looking at the last patch.
*shrug* it's here if you want it :)
-------------
Make vn_hold a void function; return is never used.
Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxxx>
Index: xfs-linux-clean/linux-2.4/xfs_vnode.c
===================================================================
--- xfs-linux-clean.orig/linux-2.4/xfs_vnode.c
+++ xfs-linux-clean/linux-2.4/xfs_vnode.c
@@ -133,7 +133,7 @@ vn_revalidate(
/*
* Add a reference to a referenced vnode.
*/
-bhv_vnode_t *
+void
vn_hold(
bhv_vnode_t *vp)
{
@@ -145,8 +145,6 @@ vn_hold(
inode = igrab(vn_to_inode(vp));
ASSERT(inode);
VN_UNLOCK(vp, 0);
-
- return vp;
}
#ifdef XFS_VNODE_TRACE
Index: xfs-linux-clean/linux-2.4/xfs_vnode.h
===================================================================
--- xfs-linux-clean.orig/linux-2.4/xfs_vnode.h
+++ xfs-linux-clean/linux-2.4/xfs_vnode.h
@@ -435,17 +435,17 @@ static inline int vn_count(struct bhv_vn
/*
* Vnode reference counting functions (and macros for compatibility).
*/
-extern bhv_vnode_t *vn_hold(struct bhv_vnode *);
+extern void vn_hold(struct bhv_vnode *);
#if defined(XFS_VNODE_TRACE)
#define VN_HOLD(vp) \
- ((void)vn_hold(vp), \
+ (vn_hold(vp), \
vn_trace_hold(vp, __FILE__, __LINE__, (inst_t *)__return_address))
#define VN_RELE(vp) \
(vn_trace_rele(vp, __FILE__, __LINE__, (inst_t *)__return_address), \
iput(vn_to_inode(vp)))
#else
-#define VN_HOLD(vp) ((void)vn_hold(vp))
+#define VN_HOLD(vp) (vn_hold(vp))
#define VN_RELE(vp) (iput(vn_to_inode(vp)))
#endif
Index: xfs-linux-clean/linux-2.6/xfs_vnode.c
===================================================================
--- xfs-linux-clean.orig/linux-2.6/xfs_vnode.c
+++ xfs-linux-clean/linux-2.6/xfs_vnode.c
@@ -172,7 +172,7 @@ vn_revalidate(
/*
* Add a reference to a referenced vnode.
*/
-bhv_vnode_t *
+void
vn_hold(
bhv_vnode_t *vp)
{
@@ -184,8 +184,6 @@ vn_hold(
inode = igrab(vn_to_inode(vp));
ASSERT(inode);
VN_UNLOCK(vp, 0);
-
- return vp;
}
#ifdef XFS_VNODE_TRACE
Index: xfs-linux-clean/linux-2.6/xfs_vnode.h
===================================================================
--- xfs-linux-clean.orig/linux-2.6/xfs_vnode.h
+++ xfs-linux-clean/linux-2.6/xfs_vnode.h
@@ -454,17 +454,17 @@ static inline int vn_count(struct bhv_vn
/*
* Vnode reference counting functions (and macros for compatibility).
*/
-extern bhv_vnode_t *vn_hold(struct bhv_vnode *);
+extern void vn_hold(struct bhv_vnode *);
#if defined(XFS_VNODE_TRACE)
#define VN_HOLD(vp) \
- ((void)vn_hold(vp), \
+ (vn_hold(vp), \
vn_trace_hold(vp, __FILE__, __LINE__, (inst_t *)__return_address))
#define VN_RELE(vp) \
(vn_trace_rele(vp, __FILE__, __LINE__, (inst_t *)__return_address), \
iput(vn_to_inode(vp)))
#else
-#define VN_HOLD(vp) ((void)vn_hold(vp))
+#define VN_HOLD(vp) (vn_hold(vp))
#define VN_RELE(vp) (iput(vn_to_inode(vp)))
#endif
|