]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[XFS] Don't allow silent errors in xfs_inactive().
authorDavid Chinner <dgc@sgi.com>
Thu, 10 Apr 2008 02:24:17 +0000 (12:24 +1000)
committerLachlan McIlroy <lachlan@redback.melbourne.sgi.com>
Fri, 18 Apr 2008 02:01:58 +0000 (12:01 +1000)
xfs_inactive() fails to report errors when committing the inactive
transaction. Hence we can get silent failures either finishing off the
truncation or committing the transaction. Even if we get errors, we need
to continue, so simply warn loudly to the system if we get errors here.

SGI-PV: 980084
SGI-Modid: xfs-linux-melb:xfs-kern:30830a

Signed-off-by: David Chinner <dgc@sgi.com>
Signed-off-by: Niv Sardi <xaiki@sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
fs/xfs/xfs_vnodeops.c

index dd4621e0ab3b82a49c694afc77337de538aeac39..6650601c64f7644f612fa2488bdfd78a0a79720d 100644 (file)
@@ -1743,11 +1743,18 @@ xfs_inactive(
                XFS_TRANS_MOD_DQUOT_BYINO(mp, tp, ip, XFS_TRANS_DQ_ICOUNT, -1);
 
                /*
-                * Just ignore errors at this point.  There is
-                * nothing we can do except to try to keep going.
+                * Just ignore errors at this point.  There is nothing we can
+                * do except to try to keep going. Make sure it's not a silent
+                * error.
                 */
-               (void) xfs_bmap_finish(&tp,  &free_list, &committed);
-               (void) xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES);
+               error = xfs_bmap_finish(&tp,  &free_list, &committed);
+               if (error)
+                       xfs_fs_cmn_err(CE_NOTE, mp, "xfs_inactive: "
+                               "xfs_bmap_finish() returned error %d", error);
+               error = xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES);
+               if (error)
+                       xfs_fs_cmn_err(CE_NOTE, mp, "xfs_inactive: "
+                               "xfs_trans_commit() returned error %d", error);
        }
        /*
         * Release the dquots held by inode, if any.