From b132f681fa2b8e6029dde2a7ed5aa070a5a5f125 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Sun, 15 Feb 2009 20:02:19 -0500 Subject: [PATCH] --- yaml --- r: 131384 b: refs/heads/master c: 090542641de833c6f756895fc2f139f046e298f9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ext4/migrate.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 84516ffef23b..c2326ce8c25c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2acf2c261b823d9d9ed954f348b97620297a36b5 +refs/heads/master: 090542641de833c6f756895fc2f139f046e298f9 diff --git a/trunk/fs/ext4/migrate.c b/trunk/fs/ext4/migrate.c index 734abca25e35..fe64d9f79852 100644 --- a/trunk/fs/ext4/migrate.c +++ b/trunk/fs/ext4/migrate.c @@ -481,7 +481,7 @@ int ext4_ext_migrate(struct inode *inode) + 1); if (IS_ERR(handle)) { retval = PTR_ERR(handle); - goto err_out; + return retval; } tmp_inode = ext4_new_inode(handle, inode->i_sb->s_root->d_inode, @@ -489,8 +489,7 @@ int ext4_ext_migrate(struct inode *inode) if (IS_ERR(tmp_inode)) { retval = -ENOMEM; ext4_journal_stop(handle); - tmp_inode = NULL; - goto err_out; + return retval; } i_size_write(tmp_inode, i_size_read(inode)); /* @@ -618,8 +617,7 @@ int ext4_ext_migrate(struct inode *inode) ext4_journal_stop(handle); - if (tmp_inode) - iput(tmp_inode); + iput(tmp_inode); return retval; }