Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 58dadcdbc2584db050969f9781727fc5a3f618db

Authored by Julia Lawall
Committed by Mark Fasheh
1 parent 4d0ddb2ce2
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

fs/ocfs2/aops.c: test for IS_ERR rather than 0 

The function ocfs2_start_trans always returns either a valid pointer or a
value made with ERR_PTR, so its result should be tested with IS_ERR, not
with a test for 0.

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>

Showing 1 changed file with 3 additions and 3 deletions Side-by-side Diff

... ... @@ -467,11 +467,11 @@
467 467 unsigned to)
468 468 {
469 469 struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
470   - handle_t *handle = NULL;
  470 + handle_t *handle;
471 471 int ret = 0;
472 472  
473 473 handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);
474   - if (!handle) {
  474 + if (IS_ERR(handle)) {
475 475 ret = -ENOMEM;
476 476 mlog_errno(ret);
477 477 goto out;
... ... @@ -487,7 +487,7 @@
487 487 }
488 488 out:
489 489 if (ret) {
490   - if (handle)
  490 + if (!IS_ERR(handle))
491 491 ocfs2_commit_trans(osb, handle);
492 492 handle = ERR_PTR(ret);
493 493 }