xfs: change some error-less functions to void types

[linux-block.git] / fs / xfs / xfs_inode.c

diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index 4591598ca04ddc764f79f0dc5e81939dae0a0690..71d216cf6f875e01516f15cafa673e0b3e0dbb78 100644 (file)
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -1116,7 +1116,7 @@ xfs_droplink(
 /*
  * Increment the link count on an inode & log the change.
  */
-static int
+static void
 xfs_bumplink(
        xfs_trans_t *tp,
        xfs_inode_t *ip)
@@ -1126,7 +1126,6 @@ xfs_bumplink(
        ASSERT(ip->i_d.di_version > 1);
        inc_nlink(VFS_I(ip));
        xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
-       return 0;
 }
 
 int
@@ -1235,9 +1234,7 @@ xfs_create(
                if (error)
                        goto out_trans_cancel;
 
-               error = xfs_bumplink(tp, dp);
-               if (error)
-                       goto out_trans_cancel;
+               xfs_bumplink(tp, dp);
        }
 
        /*
@@ -1454,9 +1451,7 @@ xfs_link(
        xfs_trans_ichgtime(tp, tdp, XFS_ICHGTIME_MOD | XFS_ICHGTIME_CHG);
        xfs_trans_log_inode(tp, tdp, XFS_ILOG_CORE);
 
-       error = xfs_bumplink(tp, sip);
-       if (error)
-               goto error_return;
+       xfs_bumplink(tp, sip);
 
        /*
         * If this is a synchronous mount, make sure that the
@@ -3097,9 +3092,7 @@ xfs_cross_rename(
                                error = xfs_droplink(tp, dp2);
                                if (error)
                                        goto out_trans_abort;
-                               error = xfs_bumplink(tp, dp1);
-                               if (error)
-                                       goto out_trans_abort;
+                               xfs_bumplink(tp, dp1);
                        }
 
                        /*
@@ -3123,9 +3116,7 @@ xfs_cross_rename(
                                error = xfs_droplink(tp, dp1);
                                if (error)
                                        goto out_trans_abort;
-                               error = xfs_bumplink(tp, dp2);
-                               if (error)
-                                       goto out_trans_abort;
+                               xfs_bumplink(tp, dp2);
                        }
 
                        /*
@@ -3322,9 +3313,7 @@ xfs_rename(
                                        XFS_ICHGTIME_MOD | XFS_ICHGTIME_CHG);
 
                if (new_parent && src_is_directory) {
-                       error = xfs_bumplink(tp, target_dp);
-                       if (error)
-                               goto out_trans_cancel;
+                       xfs_bumplink(tp, target_dp);
                }
        } else { /* target_ip != NULL */
                /*
@@ -3443,9 +3432,7 @@ xfs_rename(
         */
        if (wip) {
                ASSERT(VFS_I(wip)->i_nlink == 0);
-               error = xfs_bumplink(tp, wip);
-               if (error)
-                       goto out_trans_cancel;
+               xfs_bumplink(tp, wip);
                error = xfs_iunlink_remove(tp, wip);
                if (error)
                        goto out_trans_cancel;