All of lore.kernel.org
 help / color / mirror / Atom feed
From: Joel Becker <Joel.Becker@oracle.com>
To: ocfs2-devel@oss.oracle.com
Subject: [Ocfs2-devel] [PATCH] ocfs2: Fix check of return value of	ocfs2_start_trans()
Date: Tue, 21 Oct 2008 13:26:18 -0700	[thread overview]
Message-ID: <20081021202618.GC2871@mail.oracle.com> (raw)
In-Reply-To: <12245234424005-git-send-email-jack@suse.cz>

On Mon, Oct 20, 2008 at 07:23:51PM +0200, Jan Kara wrote:
> On failure, ocfs2_start_trans() returns values like ERR_PTR(-ENOMEM).
> Thus checks for !handle are wrong. Fix them to use IS_ERR().
> 
> Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Joel Becker <joel.becker@oracle.com>

This should go upstream.  There are two more in xattr.c (not in the
sources Jan had).

Joel

> ---
>  fs/ocfs2/file.c |   20 ++++++++++----------
>  1 files changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
> index ec2ed15..89dc20e 100644
> --- a/fs/ocfs2/file.c
> +++ b/fs/ocfs2/file.c
> @@ -246,8 +246,8 @@ int ocfs2_update_inode_atime(struct inode *inode,
>  	mlog_entry_void();
>  
>  	handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);
> -	if (handle == NULL) {
> -		ret = -ENOMEM;
> +	if (IS_ERR(handle)) {
> +		ret = PTR_ERR(handle);
>  		mlog_errno(ret);
>  		goto out;
>  	}
> @@ -311,8 +311,8 @@ static int ocfs2_simple_size_update(struct inode *inode,
>  	handle_t *handle = NULL;
>  
>  	handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);
> -	if (handle == NULL) {
> -		ret = -ENOMEM;
> +	if (IS_ERR(handle)) {
> +		ret = PTR_ERR(handle);
>  		mlog_errno(ret);
>  		goto out;
>  	}
> @@ -1209,8 +1209,8 @@ static int __ocfs2_write_remove_suid(struct inode *inode,
>  		   (unsigned long long)OCFS2_I(inode)->ip_blkno, inode->i_mode);
>  
>  	handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);
> -	if (handle == NULL) {
> -		ret = -ENOMEM;
> +	if (IS_ERR(handle)) {
> +		ret = PTR_ERR(handle);
>  		mlog_errno(ret);
>  		goto out;
>  	}
> @@ -1412,8 +1412,8 @@ static int __ocfs2_remove_inode_range(struct inode *inode,
>  	}
>  
>  	handle = ocfs2_start_trans(osb, OCFS2_REMOVE_EXTENT_CREDITS);
> -	if (handle == NULL) {
> -		ret = -ENOMEM;
> +	if (IS_ERR(handle)) {
> +		ret = PTR_ERR(handle);
>  		mlog_errno(ret);
>  		goto out;
>  	}
> @@ -1505,8 +1505,8 @@ static int ocfs2_zero_partial_clusters(struct inode *inode,
>  		goto out;
>  
>  	handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);
> -	if (handle == NULL) {
> -		ret = -ENOMEM;
> +	if (IS_ERR(handle)) {
> +		ret = PTR_ERR(handle);
>  		mlog_errno(ret);
>  		goto out;
>  	}
> -- 
> 1.5.2.4
> 
> 
> _______________________________________________
> Ocfs2-devel mailing list
> Ocfs2-devel at oss.oracle.com
> http://oss.oracle.com/mailman/listinfo/ocfs2-devel

-- 

Life's Little Instruction Book #3

	"Watch a sunrise at least once a year."

Joel Becker
Principal Software Developer
Oracle
E-mail: joel.becker at oracle.com
Phone: (650) 506-8127

  reply	other threads:[~2008-10-21 20:26 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-10-20 17:23 [Ocfs2-devel] [PATCH] ocfs2: Fix check of return value of ocfs2_start_trans() Jan Kara
2008-10-21 20:26 ` Joel Becker [this message]
2008-10-22 10:07   ` Jan Kara
2008-10-24 21:41   ` Joel Becker

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20081021202618.GC2871@mail.oracle.com \
    --to=joel.becker@oracle.com \
    --cc=ocfs2-devel@oss.oracle.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.