diff --git a/[refs] b/[refs] index dc9b31535cb2..432525a1ee31 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3d75be7c4771c7e4d5b5fa586a599af8473de32c +refs/heads/master: 87f0d5c8db7aad85b9120c26723fdc63cd84a460 diff --git a/trunk/fs/ocfs2/ioctl.c b/trunk/fs/ocfs2/ioctl.c index bc91072b7219..d9a6ce779266 100644 --- a/trunk/fs/ocfs2/ioctl.c +++ b/trunk/fs/ocfs2/ioctl.c @@ -381,7 +381,7 @@ int ocfs2_info_handle_freeinode(struct inode *inode, if (!oifi) { status = -ENOMEM; mlog_errno(status); - goto bail; + goto out_err; } if (o2info_from_user(*oifi, req)) @@ -431,7 +431,7 @@ int ocfs2_info_handle_freeinode(struct inode *inode, o2info_set_request_error(&oifi->ifi_req, req); kfree(oifi); - +out_err: return status; } @@ -666,7 +666,7 @@ int ocfs2_info_handle_freefrag(struct inode *inode, if (!oiff) { status = -ENOMEM; mlog_errno(status); - goto bail; + goto out_err; } if (o2info_from_user(*oiff, req)) @@ -716,7 +716,7 @@ int ocfs2_info_handle_freefrag(struct inode *inode, o2info_set_request_error(&oiff->iff_req, req); kfree(oiff); - +out_err: return status; }