* [Ocfs2-devel] [PATCH] ocfs2: Fix check of return value of ocfs2_start_trans()
@ 2008-10-20 17:23 Jan Kara
2008-10-21 20:26 ` Joel Becker
0 siblings, 1 reply; 4+ messages in thread
From: Jan Kara @ 2008-10-20 17:23 UTC (permalink / raw)
To: ocfs2-devel
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>
---
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* [Ocfs2-devel] [PATCH] ocfs2: Fix check of return value of ocfs2_start_trans()
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
2008-10-22 10:07 ` Jan Kara
2008-10-24 21:41 ` Joel Becker
0 siblings, 2 replies; 4+ messages in thread
From: Joel Becker @ 2008-10-21 20:26 UTC (permalink / raw)
To: ocfs2-devel
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
^ permalink raw reply [flat|nested] 4+ messages in thread* [Ocfs2-devel] [PATCH] ocfs2: Fix check of return value of ocfs2_start_trans()
2008-10-21 20:26 ` Joel Becker
@ 2008-10-22 10:07 ` Jan Kara
2008-10-24 21:41 ` Joel Becker
1 sibling, 0 replies; 4+ messages in thread
From: Jan Kara @ 2008-10-22 10:07 UTC (permalink / raw)
To: ocfs2-devel
On Tue 21-10-08 13:26:18, Joel Becker wrote:
> 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).
I have the feeling I even sent this patch to Mark once but maybe it got
lost... Mark? Should I resend you the patch?
> > ---
> > 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
Honza
--
Jan Kara <jack@suse.cz>
SUSE Labs, CR
^ permalink raw reply [flat|nested] 4+ messages in thread* [Ocfs2-devel] [PATCH] ocfs2: Fix check of return value of ocfs2_start_trans()
2008-10-21 20:26 ` Joel Becker
2008-10-22 10:07 ` Jan Kara
@ 2008-10-24 21:41 ` Joel Becker
1 sibling, 0 replies; 4+ messages in thread
From: Joel Becker @ 2008-10-24 21:41 UTC (permalink / raw)
To: ocfs2-devel
On Tue, Oct 21, 2008 at 01:26:18PM -0700, Joel Becker wrote:
> 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).
This is now in my xattr-28 branch, along with Tao's version for
xattr.c
Joel
--
Pitchers and catchers report.
Joel Becker
Principal Software Developer
Oracle
E-mail: joel.becker at oracle.com
Phone: (650) 506-8127
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2008-10-24 21:41 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2008-10-22 10:07 ` Jan Kara
2008-10-24 21:41 ` Joel Becker
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.