diff options
| author | Dave Chinner <david@fromorbit.com> | 2014-07-14 21:37:18 (GMT) |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-07-14 21:37:18 (GMT) |
| commit | 7f8a058f6dc52219117bc2469b1fb816f7fa1a4b (patch) | |
| tree | 43ce8eed4d26beb6f2acff2279c43eae7f79f83a /fs/xfs/xfs_log_cil.c | |
| parent | 03e01349c654fbdea80d3d9b4ab599244eb55bb7 (diff) | |
| parent | 2451337dd043901b5270b7586942abe564443e3d (diff) | |
| download | linux-7f8a058f6dc52219117bc2469b1fb816f7fa1a4b.tar.xz | |
Merge branch 'xfs-libxfs-restructure' into for-next
Diffstat (limited to 'fs/xfs/xfs_log_cil.c')
| -rw-r--r-- | fs/xfs/xfs_log_cil.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/xfs_log_cil.c b/fs/xfs/xfs_log_cil.c index b3425b3..2ee4388 100644 --- a/fs/xfs/xfs_log_cil.c +++ b/fs/xfs/xfs_log_cil.c @@ -634,7 +634,7 @@ out_abort_free_ticket: xfs_log_ticket_put(tic); out_abort: xlog_cil_committed(ctx, XFS_LI_ABORTED); - return XFS_ERROR(EIO); + return -EIO; } static void @@ -928,12 +928,12 @@ xlog_cil_init( cil = kmem_zalloc(sizeof(*cil), KM_SLEEP|KM_MAYFAIL); if (!cil) - return ENOMEM; + return -ENOMEM; ctx = kmem_zalloc(sizeof(*ctx), KM_SLEEP|KM_MAYFAIL); if (!ctx) { kmem_free(cil); - return ENOMEM; + return -ENOMEM; } INIT_WORK(&cil->xc_push_work, xlog_cil_push_work); |