Skip to contentSkip to conversation

xfs: remove unused transaction pointer args

PATCH In review Eric Sandeen 2 participants 4 messages Mar 29, 2014 – Apr 3, 2014 XFS filesystem

lore
Share & tools
lore

Eric Sandeen

author
#0 lore raw

PATCH 1/1 xfs: remove unused transaction pointer args

Several functions pass a transaction pointer around, but it's never used in those callchains. Remove it.

Signed-off-by Eric Sandeen <[email protected]>

---

fs/xfs/xfs_bmap.c +0 -1
index 152543c..b308097 100644
@@ -1675,7 +1675,6 @@ xfs_bmap_isaeof(
  */
 int
 xfs_bmap_last_offset(
-	struct xfs_trans	*tp,
 	struct xfs_inode	*ip,
 	xfs_fileoff_t		*last_block,
 	int			whichfork)
fs/xfs/xfs_bmap.h +2 -2
index 33b41f3..52ad38d 100644
@@ -146,8 +146,8 @@ int	xfs_bmap_first_unused(struct xfs_trans *tp, struct xfs_inode *ip,
 		xfs_extlen_t len, xfs_fileoff_t *unused, int whichfork);
 int	xfs_bmap_last_before(struct xfs_trans *tp, struct xfs_inode *ip,
 		xfs_fileoff_t *last_block, int whichfork);
-int	xfs_bmap_last_offset(struct xfs_trans *tp, struct xfs_inode *ip,
-		xfs_fileoff_t *unused, int whichfork);
+int	xfs_bmap_last_offset(struct xfs_inode *ip, xfs_fileoff_t *unused,
+		int whichfork);
 int	xfs_bmap_one_block(struct xfs_inode *ip, int whichfork);
 int	xfs_bmap_read_extents(struct xfs_trans *tp, struct xfs_inode *ip,
 		int whichfork);
fs/xfs/xfs_dir2.c +12 -14
index ce16ef0..7575a3b 100644
@@ -230,11 +230,11 @@ xfs_dir_createname(
 
 	if (dp->i_d.di_format == XFS_DINODE_FMT_LOCAL)
 		rval = xfs_dir2_sf_addname(&args);
-	else if ((rval = xfs_dir2_isblock(tp, dp, &v)))
+	else if ((rval = xfs_dir2_isblock(dp, &v)))
 		return rval;
 	else if (v)
 		rval = xfs_dir2_block_addname(&args);
-	else if ((rval = xfs_dir2_isleaf(tp, dp, &v)))
+	else if ((rval = xfs_dir2_isleaf(dp, &v)))
 		return rval;
 	else if (v)
 		rval = xfs_dir2_leaf_addname(&args);

@@ -303,11 +303,11 @@ xfs_dir_lookup(
 
 	if (dp->i_d.di_format == XFS_DINODE_FMT_LOCAL)
 		rval = xfs_dir2_sf_lookup(&args);
-	else if ((rval = xfs_dir2_isblock(tp, dp, &v)))
+	else if ((rval = xfs_dir2_isblock(dp, &v)))
 		return rval;
 	else if (v)
 		rval = xfs_dir2_block_lookup(&args);
-	else if ((rval = xfs_dir2_isleaf(tp, dp, &v)))
+	else if ((rval = xfs_dir2_isleaf(dp, &v)))
 		return rval;
 	else if (v)
 		rval = xfs_dir2_leaf_lookup(&args);

@@ -360,11 +360,11 @@ xfs_dir_removename(
 
 	if (dp->i_d.di_format == XFS_DINODE_FMT_LOCAL)
 		rval = xfs_dir2_sf_removename(&args);
-	else if ((rval = xfs_dir2_isblock(tp, dp, &v)))
+	else if ((rval = xfs_dir2_isblock(dp, &v)))
 		return rval;
 	else if (v)
 		rval = xfs_dir2_block_removename(&args);
-	else if ((rval = xfs_dir2_isleaf(tp, dp, &v)))
+	else if ((rval = xfs_dir2_isleaf(dp, &v)))
 		return rval;
 	else if (v)
 		rval = xfs_dir2_leaf_removename(&args);

@@ -410,11 +410,11 @@ xfs_dir_replace(
 
 	if (dp->i_d.di_format == XFS_DINODE_FMT_LOCAL)
 		rval = xfs_dir2_sf_replace(&args);
-	else if ((rval = xfs_dir2_isblock(tp, dp, &v)))
+	else if ((rval = xfs_dir2_isblock(dp, &v)))
 		return rval;
 	else if (v)
 		rval = xfs_dir2_block_replace(&args);
-	else if ((rval = xfs_dir2_isleaf(tp, dp, &v)))
+	else if ((rval = xfs_dir2_isleaf(dp, &v)))
 		return rval;
 	else if (v)
 		rval = xfs_dir2_leaf_replace(&args);

@@ -456,11 +456,11 @@ xfs_dir_canenter(
 
 	if (dp->i_d.di_format == XFS_DINODE_FMT_LOCAL)
 		rval = xfs_dir2_sf_addname(&args);
-	else if ((rval = xfs_dir2_isblock(tp, dp, &v)))
+	else if ((rval = xfs_dir2_isblock(dp, &v)))
 		return rval;
 	else if (v)
 		rval = xfs_dir2_block_addname(&args);
-	else if ((rval = xfs_dir2_isleaf(tp, dp, &v)))
+	else if ((rval = xfs_dir2_isleaf(dp, &v)))
 		return rval;
 	else if (v)
 		rval = xfs_dir2_leaf_addname(&args);

@@ -525,7 +525,6 @@ xfs_dir2_grow_inode(
  */
 int
 xfs_dir2_isblock(
-	xfs_trans_t	*tp,
 	xfs_inode_t	*dp,
 	int		*vp)		/* out: 1 is block, 0 is not block */
 {

@@ -534,7 +533,7 @@ xfs_dir2_isblock(
 	int		rval;
 
 	mp = dp->i_mount;
-	if ((rval = xfs_bmap_last_offset(tp, dp, &last, XFS_DATA_FORK)))
+	if ((rval = xfs_bmap_last_offset(dp, &last, XFS_DATA_FORK)))
 		return rval;
 	rval = XFS_FSB_TO_B(mp, last) == mp->m_dirblksize;
 	ASSERT(rval == 0 || dp->i_d.di_size == mp->m_dirblksize);

@@ -547,7 +546,6 @@ xfs_dir2_isblock(
  */
 int
 xfs_dir2_isleaf(
-	xfs_trans_t	*tp,
 	xfs_inode_t	*dp,
 	int		*vp)		/* out: 1 is leaf, 0 is not leaf */
 {

@@ -556,7 +554,7 @@ xfs_dir2_isleaf(
 	int		rval;
 
 	mp = dp->i_mount;
-	if ((rval = xfs_bmap_last_offset(tp, dp, &last, XFS_DATA_FORK)))
+	if ((rval = xfs_bmap_last_offset(dp, &last, XFS_DATA_FORK)))
 		return rval;
 	*vp = last == mp->m_dirleafblk + (1 << mp->m_sb.sb_dirblklog);
 	return 0;
fs/xfs/xfs_dir2.h +2 -2
index cec70e0..64a6b19 100644
@@ -142,8 +142,8 @@ extern int xfs_dir2_sf_to_block(struct xfs_da_args *args);
 /*
  * Interface routines used by userspace utilities
  */
-extern int xfs_dir2_isblock(struct xfs_trans *tp, struct xfs_inode *dp, int *r);
-extern int xfs_dir2_isleaf(struct xfs_trans *tp, struct xfs_inode *dp, int *r);
+extern int xfs_dir2_isblock(struct xfs_inode *dp, int *r);
+extern int xfs_dir2_isleaf(struct xfs_inode *dp, int *r);
 extern int xfs_dir2_shrink_inode(struct xfs_da_args *args, xfs_dir2_db_t db,
 				struct xfs_buf *bp);
fs/xfs/xfs_dir2_leaf.c +1 -1
index ae47ec6..f8170bc 100644
@@ -1707,7 +1707,7 @@ xfs_dir2_node_to_leaf(
 	/*
 	 * Get the last offset in the file.
 	 */
-	if ((error = xfs_bmap_last_offset(tp, dp, &fo, XFS_DATA_FORK))) {
+	if ((error = xfs_bmap_last_offset(dp, &fo, XFS_DATA_FORK))) {
 		return error;
 	}
 	fo -= mp->m_dirblkfsbs;
fs/xfs/xfs_dir2_node.c +1 -1
index 48c7d18..807946d 100644
@@ -1726,7 +1726,7 @@ xfs_dir2_node_addname_int(
 	if (dbno == -1) {
 		xfs_fileoff_t	fo;		/* freespace block number */
 
-		if ((error = xfs_bmap_last_offset(tp, dp, &fo, XFS_DATA_FORK)))
+		if ((error = xfs_bmap_last_offset(dp, &fo, XFS_DATA_FORK)))
 			return error;
 		lastfbno = xfs_dir2_da_to_db(mp, (xfs_dablk_t)fo);
 		fbno = ifbno;
fs/xfs/xfs_dir2_readdir.c +1 -1
index aead369..a18000f 100644
@@ -687,7 +687,7 @@ xfs_readdir(
 	lock_mode = xfs_ilock_data_map_shared(dp);
 	if (dp->i_d.di_format == XFS_DINODE_FMT_LOCAL)
 		rval = xfs_dir2_sf_getdents(dp, ctx);
-	else if ((rval = xfs_dir2_isblock(NULL, dp, &v)))
+	else if ((rval = xfs_dir2_isblock(dp, &v)))
 		;
 	else if (v)
 		rval = xfs_dir2_block_getdents(dp, ctx);
fs/xfs/xfs_iomap.c +1 -1
index 22d1cbe..2b2739c 100644
@@ -734,7 +734,7 @@ xfs_iomap_write_allocate(
 			 */
 			nimaps = 1;
 			end_fsb = XFS_B_TO_FSB(mp, XFS_ISIZE(ip));
-			error = xfs_bmap_last_offset(NULL, ip, &last_block,
+			error = xfs_bmap_last_offset(ip, &last_block,
 							XFS_DATA_FORK);
 			if (error)
 				goto trans_cancel;

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

#1 lore raw
Quoted 11 lines · Eric Sandeen

Several functions pass a transaction pointer around, but it's never used in those callchains. Remove it.

Signed-off-by Eric Sandeen <[email protected]>

---

fs/xfs/xfs_bmap.c +0 -0
index 152543c..b308097 100644

fs/xfs/xfs_bmap.c xfs_bmap_isaeof( · line 1680

Quoted 7 lines
fs/xfs/xfs_bmap.c +0 -1
@@ -1675,7 +1675,6 @@ xfs_bmap_isaeof(
  */
 int
 xfs_bmap_last_offset(
-	struct xfs_trans	*tp,
 	struct xfs_inode	*ip,
 	xfs_fileoff_t		*last_block,
 	int			whichfork)

Seems Ok to me, but it looks like you could also kill the tp param for xfs_bmap_last_extent(). I don't see any callers that don't pass NULL...

Brian

Quoted 192 lines
fs/xfs/xfs_bmap.h +2 -2
index 33b41f3..52ad38d 100644
@@ -146,8 +146,8 @@ int	xfs_bmap_first_unused(struct xfs_trans *tp, struct xfs_inode *ip,
 		xfs_extlen_t len, xfs_fileoff_t *unused, int whichfork);
 int	xfs_bmap_last_before(struct xfs_trans *tp, struct xfs_inode *ip,
 		xfs_fileoff_t *last_block, int whichfork);
-int	xfs_bmap_last_offset(struct xfs_trans *tp, struct xfs_inode *ip,
-		xfs_fileoff_t *unused, int whichfork);
+int	xfs_bmap_last_offset(struct xfs_inode *ip, xfs_fileoff_t *unused,
+		int whichfork);
 int	xfs_bmap_one_block(struct xfs_inode *ip, int whichfork);
 int	xfs_bmap_read_extents(struct xfs_trans *tp, struct xfs_inode *ip,
 		int whichfork);
fs/xfs/xfs_dir2.c +12 -14
index ce16ef0..7575a3b 100644
@@ -230,11 +230,11 @@ xfs_dir_createname(
 
 	if (dp->i_d.di_format == XFS_DINODE_FMT_LOCAL)
 		rval = xfs_dir2_sf_addname(&args);
-	else if ((rval = xfs_dir2_isblock(tp, dp, &v)))
+	else if ((rval = xfs_dir2_isblock(dp, &v)))
 		return rval;
 	else if (v)
 		rval = xfs_dir2_block_addname(&args);
-	else if ((rval = xfs_dir2_isleaf(tp, dp, &v)))
+	else if ((rval = xfs_dir2_isleaf(dp, &v)))
 		return rval;
 	else if (v)
 		rval = xfs_dir2_leaf_addname(&args);

@@ -303,11 +303,11 @@ xfs_dir_lookup(
 
 	if (dp->i_d.di_format == XFS_DINODE_FMT_LOCAL)
 		rval = xfs_dir2_sf_lookup(&args);
-	else if ((rval = xfs_dir2_isblock(tp, dp, &v)))
+	else if ((rval = xfs_dir2_isblock(dp, &v)))
 		return rval;
 	else if (v)
 		rval = xfs_dir2_block_lookup(&args);
-	else if ((rval = xfs_dir2_isleaf(tp, dp, &v)))
+	else if ((rval = xfs_dir2_isleaf(dp, &v)))
 		return rval;
 	else if (v)
 		rval = xfs_dir2_leaf_lookup(&args);

@@ -360,11 +360,11 @@ xfs_dir_removename(
 
 	if (dp->i_d.di_format == XFS_DINODE_FMT_LOCAL)
 		rval = xfs_dir2_sf_removename(&args);
-	else if ((rval = xfs_dir2_isblock(tp, dp, &v)))
+	else if ((rval = xfs_dir2_isblock(dp, &v)))
 		return rval;
 	else if (v)
 		rval = xfs_dir2_block_removename(&args);
-	else if ((rval = xfs_dir2_isleaf(tp, dp, &v)))
+	else if ((rval = xfs_dir2_isleaf(dp, &v)))
 		return rval;
 	else if (v)
 		rval = xfs_dir2_leaf_removename(&args);

@@ -410,11 +410,11 @@ xfs_dir_replace(
 
 	if (dp->i_d.di_format == XFS_DINODE_FMT_LOCAL)
 		rval = xfs_dir2_sf_replace(&args);
-	else if ((rval = xfs_dir2_isblock(tp, dp, &v)))
+	else if ((rval = xfs_dir2_isblock(dp, &v)))
 		return rval;
 	else if (v)
 		rval = xfs_dir2_block_replace(&args);
-	else if ((rval = xfs_dir2_isleaf(tp, dp, &v)))
+	else if ((rval = xfs_dir2_isleaf(dp, &v)))
 		return rval;
 	else if (v)
 		rval = xfs_dir2_leaf_replace(&args);

@@ -456,11 +456,11 @@ xfs_dir_canenter(
 
 	if (dp->i_d.di_format == XFS_DINODE_FMT_LOCAL)
 		rval = xfs_dir2_sf_addname(&args);
-	else if ((rval = xfs_dir2_isblock(tp, dp, &v)))
+	else if ((rval = xfs_dir2_isblock(dp, &v)))
 		return rval;
 	else if (v)
 		rval = xfs_dir2_block_addname(&args);
-	else if ((rval = xfs_dir2_isleaf(tp, dp, &v)))
+	else if ((rval = xfs_dir2_isleaf(dp, &v)))
 		return rval;
 	else if (v)
 		rval = xfs_dir2_leaf_addname(&args);

@@ -525,7 +525,6 @@ xfs_dir2_grow_inode(
  */
 int
 xfs_dir2_isblock(
-	xfs_trans_t	*tp,
 	xfs_inode_t	*dp,
 	int		*vp)		/* out: 1 is block, 0 is not block */
 {

@@ -534,7 +533,7 @@ xfs_dir2_isblock(
 	int		rval;
 
 	mp = dp->i_mount;
-	if ((rval = xfs_bmap_last_offset(tp, dp, &last, XFS_DATA_FORK)))
+	if ((rval = xfs_bmap_last_offset(dp, &last, XFS_DATA_FORK)))
 		return rval;
 	rval = XFS_FSB_TO_B(mp, last) == mp->m_dirblksize;
 	ASSERT(rval == 0 || dp->i_d.di_size == mp->m_dirblksize);

@@ -547,7 +546,6 @@ xfs_dir2_isblock(
  */
 int
 xfs_dir2_isleaf(
-	xfs_trans_t	*tp,
 	xfs_inode_t	*dp,
 	int		*vp)		/* out: 1 is leaf, 0 is not leaf */
 {

@@ -556,7 +554,7 @@ xfs_dir2_isleaf(
 	int		rval;
 
 	mp = dp->i_mount;
-	if ((rval = xfs_bmap_last_offset(tp, dp, &last, XFS_DATA_FORK)))
+	if ((rval = xfs_bmap_last_offset(dp, &last, XFS_DATA_FORK)))
 		return rval;
 	*vp = last == mp->m_dirleafblk + (1 << mp->m_sb.sb_dirblklog);
 	return 0;
fs/xfs/xfs_dir2.h +2 -2
index cec70e0..64a6b19 100644
@@ -142,8 +142,8 @@ extern int xfs_dir2_sf_to_block(struct xfs_da_args *args);
 /*
  * Interface routines used by userspace utilities
  */
-extern int xfs_dir2_isblock(struct xfs_trans *tp, struct xfs_inode *dp, int *r);
-extern int xfs_dir2_isleaf(struct xfs_trans *tp, struct xfs_inode *dp, int *r);
+extern int xfs_dir2_isblock(struct xfs_inode *dp, int *r);
+extern int xfs_dir2_isleaf(struct xfs_inode *dp, int *r);
 extern int xfs_dir2_shrink_inode(struct xfs_da_args *args, xfs_dir2_db_t db,
 				struct xfs_buf *bp);
fs/xfs/xfs_dir2_leaf.c +1 -1
index ae47ec6..f8170bc 100644
@@ -1707,7 +1707,7 @@ xfs_dir2_node_to_leaf(
 	/*
 	 * Get the last offset in the file.
 	 */
-	if ((error = xfs_bmap_last_offset(tp, dp, &fo, XFS_DATA_FORK))) {
+	if ((error = xfs_bmap_last_offset(dp, &fo, XFS_DATA_FORK))) {
 		return error;
 	}
 	fo -= mp->m_dirblkfsbs;
fs/xfs/xfs_dir2_node.c +1 -1
index 48c7d18..807946d 100644
@@ -1726,7 +1726,7 @@ xfs_dir2_node_addname_int(
 	if (dbno == -1) {
 		xfs_fileoff_t	fo;		/* freespace block number */
 
-		if ((error = xfs_bmap_last_offset(tp, dp, &fo, XFS_DATA_FORK)))
+		if ((error = xfs_bmap_last_offset(dp, &fo, XFS_DATA_FORK)))
 			return error;
 		lastfbno = xfs_dir2_da_to_db(mp, (xfs_dablk_t)fo);
 		fbno = ifbno;
fs/xfs/xfs_dir2_readdir.c +1 -1
index aead369..a18000f 100644
@@ -687,7 +687,7 @@ xfs_readdir(
 	lock_mode = xfs_ilock_data_map_shared(dp);
 	if (dp->i_d.di_format == XFS_DINODE_FMT_LOCAL)
 		rval = xfs_dir2_sf_getdents(dp, ctx);
-	else if ((rval = xfs_dir2_isblock(NULL, dp, &v)))
+	else if ((rval = xfs_dir2_isblock(dp, &v)))
 		;
 	else if (v)
 		rval = xfs_dir2_block_getdents(dp, ctx);
fs/xfs/xfs_iomap.c +1 -1
index 22d1cbe..2b2739c 100644
@@ -734,7 +734,7 @@ xfs_iomap_write_allocate(
 			 */
 			nimaps = 1;
 			end_fsb = XFS_B_TO_FSB(mp, XFS_ISIZE(ip));
-			error = xfs_bmap_last_offset(NULL, ip, &last_block,
+			error = xfs_bmap_last_offset(ip, &last_block,
 							XFS_DATA_FORK);
 			if (error)
 				goto trans_cancel;
Quoted 4 lines

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

author
#2 lore raw
Quoted 10 lines · Brian Foster
Quoted 8 lines · Eric Sandeen

Several functions pass a transaction pointer around, but it's never used in those callchains. Remove it.

Signed-off-by Eric Sandeen <[email protected]>

---

Quoted 16 lines
Quoted 6 lines
fs/xfs/xfs_bmap.c +0 -0
index 152543c..b308097 100644
@@ -1675,7 +1675,6 @@ xfs_bmap_isaeof(
 */
Quoted 6 lines

int
xfs_bmap_last_offset(
- struct xfs_trans *tp,
struct xfs_inode *ip,
xfs_fileoff_t *last_block,
int whichfork)

Seems Ok to me, but it looks like you could also kill the tp param for xfs_bmap_last_extent(). I don't see any callers that don't pass NULL...

Ok thanks will resend. Actually have a big batch of unused param removals from some mindless work on the plane...

Eric

Quoted 194 lines

Brian

Quoted 192 lines
fs/xfs/xfs_bmap.h +2 -2
index 33b41f3..52ad38d 100644
@@ -146,8 +146,8 @@ int    xfs_bmap_first_unused(struct xfs_trans *tp, struct xfs_inode *ip,
       xfs_extlen_t len, xfs_fileoff_t *unused, int whichfork);
 int    xfs_bmap_last_before(struct xfs_trans *tp, struct xfs_inode *ip,
       xfs_fileoff_t *last_block, int whichfork);
-int    xfs_bmap_last_offset(struct xfs_trans *tp, struct xfs_inode *ip,
-        xfs_fileoff_t *unused, int whichfork);
+int    xfs_bmap_last_offset(struct xfs_inode *ip, xfs_fileoff_t *unused,
+        int whichfork);
 int    xfs_bmap_one_block(struct xfs_inode *ip, int whichfork);
 int    xfs_bmap_read_extents(struct xfs_trans *tp, struct xfs_inode *ip,
       int whichfork);
fs/xfs/xfs_dir2.c +10 -10
index ce16ef0..7575a3b 100644
@@ -230,11 +230,11 @@ xfs_dir_createname(
 
   if (dp->i_d.di_format == XFS_DINODE_FMT_LOCAL)
       rval = xfs_dir2_sf_addname(&args);
-    else if ((rval = xfs_dir2_isblock(tp, dp, &v)))
+    else if ((rval = xfs_dir2_isblock(dp, &v)))
       return rval;
   else if (v)
       rval = xfs_dir2_block_addname(&args);
-    else if ((rval = xfs_dir2_isleaf(tp, dp, &v)))
+    else if ((rval = xfs_dir2_isleaf(dp, &v)))
       return rval;
   else if (v)
       rval = xfs_dir2_leaf_addname(&args);

@@ -303,11 +303,11 @@ xfs_dir_lookup(
 
   if (dp->i_d.di_format == XFS_DINODE_FMT_LOCAL)
       rval = xfs_dir2_sf_lookup(&args);
-    else if ((rval = xfs_dir2_isblock(tp, dp, &v)))
+    else if ((rval = xfs_dir2_isblock(dp, &v)))
       return rval;
   else if (v)
       rval = xfs_dir2_block_lookup(&args);
-    else if ((rval = xfs_dir2_isleaf(tp, dp, &v)))
+    else if ((rval = xfs_dir2_isleaf(dp, &v)))
       return rval;
   else if (v)
       rval = xfs_dir2_leaf_lookup(&args);

@@ -360,11 +360,11 @@ xfs_dir_removename(
 
   if (dp->i_d.di_format == XFS_DINODE_FMT_LOCAL)
       rval = xfs_dir2_sf_removename(&args);
-    else if ((rval = xfs_dir2_isblock(tp, dp, &v)))
+    else if ((rval = xfs_dir2_isblock(dp, &v)))
       return rval;
   else if (v)
       rval = xfs_dir2_block_removename(&args);
-    else if ((rval = xfs_dir2_isleaf(tp, dp, &v)))
+    else if ((rval = xfs_dir2_isleaf(dp, &v)))
       return rval;
   else if (v)
       rval = xfs_dir2_leaf_removename(&args);

@@ -410,11 +410,11 @@ xfs_dir_replace(
 
   if (dp->i_d.di_format == XFS_DINODE_FMT_LOCAL)
       rval = xfs_dir2_sf_replace(&args);
-    else if ((rval = xfs_dir2_isblock(tp, dp, &v)))
+    else if ((rval = xfs_dir2_isblock(dp, &v)))
       return rval;
   else if (v)
       rval = xfs_dir2_block_replace(&args);
-    else if ((rval = xfs_dir2_isleaf(tp, dp, &v)))
+    else if ((rval = xfs_dir2_isleaf(dp, &v)))
       return rval;
   else if (v)
       rval = xfs_dir2_leaf_replace(&args);

@@ -456,11 +456,11 @@ xfs_dir_canenter(
 
   if (dp->i_d.di_format == XFS_DINODE_FMT_LOCAL)
       rval = xfs_dir2_sf_addname(&args);
-    else if ((rval = xfs_dir2_isblock(tp, dp, &v)))
+    else if ((rval = xfs_dir2_isblock(dp, &v)))
       return rval;
   else if (v)
       rval = xfs_dir2_block_addname(&args);
-    else if ((rval = xfs_dir2_isleaf(tp, dp, &v)))
+    else if ((rval = xfs_dir2_isleaf(dp, &v)))
       return rval;
   else if (v)
       rval = xfs_dir2_leaf_addname(&args);

@@ -525,7 +525,6 @@ xfs_dir2_grow_inode(
 */

int
xfs_dir2_isblock(
- xfs_trans_t *tp,
xfs_inode_t *dp,
int *vp) /* out: 1 is block, 0 is not block */
{

fs/xfs/xfs_dir2.c +1 -1
@@ -534,7 +533,7 @@ xfs_dir2_isblock(
   int        rval;
 
   mp = dp->i_mount;
-    if ((rval = xfs_bmap_last_offset(tp, dp, &last, XFS_DATA_FORK)))
+    if ((rval = xfs_bmap_last_offset(dp, &last, XFS_DATA_FORK)))
       return rval;
   rval = XFS_FSB_TO_B(mp, last) == mp->m_dirblksize;
   ASSERT(rval == 0 || dp->i_d.di_size == mp->m_dirblksize);

@@ -547,7 +546,6 @@ xfs_dir2_isblock(
 */

int
xfs_dir2_isleaf(
- xfs_trans_t *tp,
xfs_inode_t *dp,
int *vp) /* out: 1 is leaf, 0 is not leaf */
{

fs/xfs/xfs_dir2.c +1 -1
@@ -556,7 +554,7 @@ xfs_dir2_isleaf(
   int        rval;
 
   mp = dp->i_mount;
-    if ((rval = xfs_bmap_last_offset(tp, dp, &last, XFS_DATA_FORK)))
+    if ((rval = xfs_bmap_last_offset(dp, &last, XFS_DATA_FORK)))
       return rval;
   *vp = last == mp->m_dirleafblk + (1 << mp->m_sb.sb_dirblklog);
   return 0;
fs/xfs/xfs_dir2.h +2 -2
index cec70e0..64a6b19 100644
@@ -142,8 +142,8 @@ extern int xfs_dir2_sf_to_block(struct xfs_da_args *args);
 /*
 * Interface routines used by userspace utilities
 */
-extern int xfs_dir2_isblock(struct xfs_trans *tp, struct xfs_inode *dp, int *r);
-extern int xfs_dir2_isleaf(struct xfs_trans *tp, struct xfs_inode *dp, int *r);
+extern int xfs_dir2_isblock(struct xfs_inode *dp, int *r);
+extern int xfs_dir2_isleaf(struct xfs_inode *dp, int *r);
 extern int xfs_dir2_shrink_inode(struct xfs_da_args *args, xfs_dir2_db_t db,
               struct xfs_buf *bp);
fs/xfs/xfs_dir2_leaf.c +1 -1
index ae47ec6..f8170bc 100644
@@ -1707,7 +1707,7 @@ xfs_dir2_node_to_leaf(
   /*
    * Get the last offset in the file.
    */
-    if ((error = xfs_bmap_last_offset(tp, dp, &fo, XFS_DATA_FORK))) {
+    if ((error = xfs_bmap_last_offset(dp, &fo, XFS_DATA_FORK))) {
       return error;
   }
   fo -= mp->m_dirblkfsbs;
fs/xfs/xfs_dir2_node.c +1 -1
index 48c7d18..807946d 100644
@@ -1726,7 +1726,7 @@ xfs_dir2_node_addname_int(
   if (dbno == -1) {
       xfs_fileoff_t    fo;        /* freespace block number */
 
-        if ((error = xfs_bmap_last_offset(tp, dp, &fo, XFS_DATA_FORK)))
+        if ((error = xfs_bmap_last_offset(dp, &fo, XFS_DATA_FORK)))
           return error;
       lastfbno = xfs_dir2_da_to_db(mp, (xfs_dablk_t)fo);
       fbno = ifbno;
fs/xfs/xfs_dir2_readdir.c +1 -1
index aead369..a18000f 100644
@@ -687,7 +687,7 @@ xfs_readdir(
   lock_mode = xfs_ilock_data_map_shared(dp);
   if (dp->i_d.di_format == XFS_DINODE_FMT_LOCAL)
       rval = xfs_dir2_sf_getdents(dp, ctx);
-    else if ((rval = xfs_dir2_isblock(NULL, dp, &v)))
+    else if ((rval = xfs_dir2_isblock(dp, &v)))
       ;
   else if (v)
       rval = xfs_dir2_block_getdents(dp, ctx);
fs/xfs/xfs_iomap.c +1 -1
index 22d1cbe..2b2739c 100644
@@ -734,7 +734,7 @@ xfs_iomap_write_allocate(
            */
           nimaps = 1;
           end_fsb = XFS_B_TO_FSB(mp, XFS_ISIZE(ip));
-            error = xfs_bmap_last_offset(NULL, ip, &last_block,
+            error = xfs_bmap_last_offset(ip, &last_block,
                           XFS_DATA_FORK);
           if (error)
               goto trans_cancel;
Quoted 5 lines
Quoted 4 lines

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

author
#3 lore raw
In reply to Brian Foster
Quoted 23 lines · Brian Foster
Quoted 11 lines · Eric Sandeen

Several functions pass a transaction pointer around, but it's never used in those callchains. Remove it.

Signed-off-by Eric Sandeen <[email protected]>

---

fs/xfs/xfs_bmap.c +0 -0
index 152543c..b308097 100644

fs/xfs/xfs_bmap.c xfs_bmap_isaeof( · line 1680

Quoted 7 lines
fs/xfs/xfs_bmap.c +0 -1
@@ -1675,7 +1675,6 @@ xfs_bmap_isaeof(
  */
 int
 xfs_bmap_last_offset(
-	struct xfs_trans	*tp,
 	struct xfs_inode	*ip,
 	xfs_fileoff_t		*last_block,
 	int			whichfork)

Seems Ok to me, but it looks like you could also kill the tp param for xfs_bmap_last_extent(). I don't see any callers that don't pass NULL...

Quoted 1 line

Brian

Actually I think that'd be a separate change, and not totally obvious that it's one we should make - I'm (lazily) not sure if someone might need to pass in a tp to be used in xfs_iread_extents() some time in the future...

-Eric

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs