Merge tag 'ntb-4.6' of git://github.com/jonmason/ntb

[deliverable/linux.git] / fs / xfs / xfs_trans.c

diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c
index 748b16aff45a1cf959603b24131a69e289d99a95..20c53666cb4b3272400bc7111d285f104e555d75 100644 (file)
--- a/fs/xfs/xfs_trans.c
+++ b/fs/xfs/xfs_trans.c
@@ -1028,6 +1028,8 @@ __xfs_trans_roll(
        struct xfs_trans_res    tres;
        int                     error;
 
+       *committed = 0;
+
        /*
         * Ensure that the inode is always logged.
         */
@@ -1082,6 +1084,6 @@ xfs_trans_roll(
        struct xfs_trans        **tpp,
        struct xfs_inode        *dp)
 {
-       int                     committed = 0;
+       int                     committed;
        return __xfs_trans_roll(tpp, dp, &committed);
 }