From 88b43aff6e3c021280ae5181c713c27198a6a7f3 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Fri, 28 Mar 2008 14:43:10 -0700 Subject: [PATCH] --- yaml --- r: 89595 b: refs/heads/master c: 58dadcdbc2584db050969f9781727fc5a3f618db h: refs/heads/master i: 89593: fe7d5b041c7393e011658195777ba80deb24761e 89591: d0f11072aa869c32ac5adc98b955402fddf09792 v: v3 --- [refs] | 2 +- trunk/fs/ocfs2/aops.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 43574577b975..ceec5955dd7f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4d0ddb2ce25db2254d468233d942276ecf40bff8 +refs/heads/master: 58dadcdbc2584db050969f9781727fc5a3f618db diff --git a/trunk/fs/ocfs2/aops.c b/trunk/fs/ocfs2/aops.c index 90383ed61005..17964c0505a9 100644 --- a/trunk/fs/ocfs2/aops.c +++ b/trunk/fs/ocfs2/aops.c @@ -467,11 +467,11 @@ handle_t *ocfs2_start_walk_page_trans(struct inode *inode, unsigned to) { struct ocfs2_super *osb = OCFS2_SB(inode->i_sb); - handle_t *handle = NULL; + handle_t *handle; int ret = 0; handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS); - if (!handle) { + if (IS_ERR(handle)) { ret = -ENOMEM; mlog_errno(ret); goto out; @@ -487,7 +487,7 @@ handle_t *ocfs2_start_walk_page_trans(struct inode *inode, } out: if (ret) { - if (handle) + if (!IS_ERR(handle)) ocfs2_commit_trans(osb, handle); handle = ERR_PTR(ret); }