diff options
| author | Dave Chinner <david@fromorbit.com> | 2016-03-15 11:44:35 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2016-03-15 11:44:35 +1100 |
| commit | 2cdb958aba6afbced5bc563167813b972b6acbfe (patch) | |
| tree | 1ad9f3ec2753f80e94e62353ffd5d80d24c3c8f9 /fs/xfs/xfs_trans.c | |
| parent | ab9d1e4f7b0217948a3b35a64178602ab30ff45d (diff) | |
| parent | 355cced45286ed7e710058174066628ff9ad9fa4 (diff) | |
Merge branch 'xfs-misc-fixes-4.6-4' into for-nextxfs-for-linus-4.6-rc1
Diffstat (limited to 'fs/xfs/xfs_trans.c')
| -rw-r--r-- | fs/xfs/xfs_trans.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c index 748b16aff45a..20c53666cb4b 100644 --- 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); } |