* [patch] xfs: remove an unneeded NULL check
@ 2012-01-28 10:55 Dan Carpenter
2012-01-31 22:04 ` [NOTES] " Phil White
2012-01-31 22:56 ` Dave Chinner
0 siblings, 2 replies; 8+ messages in thread
From: Dan Carpenter @ 2012-01-28 10:55 UTC (permalink / raw)
To: Ben Myers; +Cc: xfs-masters, Alex Elder, kernel-janitors, xfs
Smatch complains because we check "commit_lsn" for NULL inconsistently.
fs/xfs/xfs_log_cil.c +705 xfs_log_commit_cil(43) error: we previously
assumed 'commit_lsn' could be null (see line 688)
xfs_log_commit_cil() is only called from one place, and "commit_lsn" is
a valid pointer, so I've removed the NULL check.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/fs/xfs/xfs_log_cil.c b/fs/xfs/xfs_log_cil.c
index d4fadbe..d9c4652 100644
--- a/fs/xfs/xfs_log_cil.c
+++ b/fs/xfs/xfs_log_cil.c
@@ -685,8 +685,7 @@ xfs_log_commit_cil(
/* lock out background commit */
down_read(&log->l_cilp->xc_ctx_lock);
- if (commit_lsn)
- *commit_lsn = log->l_cilp->xc_ctx->sequence;
+ *commit_lsn = log->l_cilp->xc_ctx->sequence;
xlog_cil_insert_items(log, log_vector, tp->t_ticket);
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [NOTES] [patch] xfs: remove an unneeded NULL check
2012-01-28 10:55 [patch] xfs: remove an unneeded NULL check Dan Carpenter
@ 2012-01-31 22:04 ` Phil White
2012-01-31 22:56 ` Dave Chinner
1 sibling, 0 replies; 8+ messages in thread
From: Phil White @ 2012-01-31 22:04 UTC (permalink / raw)
To: xfs
#pwhite: We can safely remove this check because the one call to
#xfs_log_commit_cil() comes from xfs_trans_commit() and passes a pointer to a
#local variable.
Smatch complains because we check "commit_lsn" for NULL inconsistently.
fs/xfs/xfs_log_cil.c +705 xfs_log_commit_cil(43) error: we previously
assumed 'commit_lsn' could be null (see line 688)
xfs_log_commit_cil() is only called from one place, and "commit_lsn" is
a valid pointer, so I've removed the NULL check.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Phil White <pwhite@sgi.com>
diff --git a/fs/xfs/xfs_log_cil.c b/fs/xfs/xfs_log_cil.c
index d4fadbe..d9c4652 100644
--- a/fs/xfs/xfs_log_cil.c
+++ b/fs/xfs/xfs_log_cil.c
@@ -685,8 +685,7 @@ xfs_log_commit_cil(
/* lock out background commit */
down_read(&log->l_cilp->xc_ctx_lock);
- if (commit_lsn)
- *commit_lsn = log->l_cilp->xc_ctx->sequence;
+ *commit_lsn = log->l_cilp->xc_ctx->sequence;
xlog_cil_insert_items(log, log_vector, tp->t_ticket);
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [patch] xfs: remove an unneeded NULL check
2012-01-28 10:55 [patch] xfs: remove an unneeded NULL check Dan Carpenter
2012-01-31 22:04 ` [NOTES] " Phil White
@ 2012-01-31 22:56 ` Dave Chinner
2012-01-31 23:08 ` Ben Myers
2012-02-01 10:45 ` Christoph Hellwig
1 sibling, 2 replies; 8+ messages in thread
From: Dave Chinner @ 2012-01-31 22:56 UTC (permalink / raw)
To: Dan Carpenter; +Cc: xfs-masters, Ben Myers, Alex Elder, kernel-janitors, xfs
On Sat, Jan 28, 2012 at 01:55:01PM +0300, Dan Carpenter wrote:
> Smatch complains because we check "commit_lsn" for NULL inconsistently.
> fs/xfs/xfs_log_cil.c +705 xfs_log_commit_cil(43) error: we previously
> assumed 'commit_lsn' could be null (see line 688)
> xfs_log_commit_cil() is only called from one place, and "commit_lsn" is
> a valid pointer, so I've removed the NULL check.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/fs/xfs/xfs_log_cil.c b/fs/xfs/xfs_log_cil.c
> index d4fadbe..d9c4652 100644
> --- a/fs/xfs/xfs_log_cil.c
> +++ b/fs/xfs/xfs_log_cil.c
> @@ -685,8 +685,7 @@ xfs_log_commit_cil(
>
> /* lock out background commit */
> down_read(&log->l_cilp->xc_ctx_lock);
> - if (commit_lsn)
> - *commit_lsn = log->l_cilp->xc_ctx->sequence;
> + *commit_lsn = log->l_cilp->xc_ctx->sequence;
>
> xlog_cil_insert_items(log, log_vector, tp->t_ticket);
There's a set of reviewed patches (for 3.3) that change all this
code. The null check might still be there, but that needs to be
checked.
On that note, Ben, can you get all of the reviewed patches that are
currently outstanding into the for-next branch of the oss tree? We
need this done sooner rather than later so that all our current
testing during development is done with those patches applied. it
also helps us to avoid conflicts between patchsets that touch the
same code (which I have quite a few of at the moment)....
Cheers,
Dave.
--
Dave Chinner
david@fromorbit.com
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [patch] xfs: remove an unneeded NULL check
2012-01-31 22:56 ` Dave Chinner
@ 2012-01-31 23:08 ` Ben Myers
2012-02-01 10:45 ` Christoph Hellwig
1 sibling, 0 replies; 8+ messages in thread
From: Ben Myers @ 2012-01-31 23:08 UTC (permalink / raw)
To: Dave Chinner; +Cc: xfs-masters, Alex Elder, kernel-janitors, Dan Carpenter, xfs
On Wed, Feb 01, 2012 at 09:56:01AM +1100, Dave Chinner wrote:
> On Sat, Jan 28, 2012 at 01:55:01PM +0300, Dan Carpenter wrote:
> > Smatch complains because we check "commit_lsn" for NULL inconsistently.
> > fs/xfs/xfs_log_cil.c +705 xfs_log_commit_cil(43) error: we previously
> > assumed 'commit_lsn' could be null (see line 688)
> > xfs_log_commit_cil() is only called from one place, and "commit_lsn" is
> > a valid pointer, so I've removed the NULL check.
> >
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> >
> > diff --git a/fs/xfs/xfs_log_cil.c b/fs/xfs/xfs_log_cil.c
> > index d4fadbe..d9c4652 100644
> > --- a/fs/xfs/xfs_log_cil.c
> > +++ b/fs/xfs/xfs_log_cil.c
> > @@ -685,8 +685,7 @@ xfs_log_commit_cil(
> >
> > /* lock out background commit */
> > down_read(&log->l_cilp->xc_ctx_lock);
> > - if (commit_lsn)
> > - *commit_lsn = log->l_cilp->xc_ctx->sequence;
> > + *commit_lsn = log->l_cilp->xc_ctx->sequence;
> >
> > xlog_cil_insert_items(log, log_vector, tp->t_ticket);
>
> There's a set of reviewed patches (for 3.3) that change all this
> code. The null check might still be there, but that needs to be
> checked.
>
> On that note, Ben, can you get all of the reviewed patches that are
> currently outstanding into the for-next branch of the oss tree? We
> need this done sooner rather than later so that all our current
> testing during development is done with those patches applied. it
> also helps us to avoid conflicts between patchsets that touch the
> same code (which I have quite a few of at the moment)....
I'll have it resolved ASAP.
-Ben
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [patch] xfs: remove an unneeded NULL check
2012-01-31 22:56 ` Dave Chinner
2012-01-31 23:08 ` Ben Myers
@ 2012-02-01 10:45 ` Christoph Hellwig
2012-02-01 21:13 ` Dave Chinner
1 sibling, 1 reply; 8+ messages in thread
From: Christoph Hellwig @ 2012-02-01 10:45 UTC (permalink / raw)
To: Dave Chinner
Cc: Alex Elder, kernel-janitors, xfs, xfs-masters, Ben Myers,
Dan Carpenter
On Wed, Feb 01, 2012 at 09:56:01AM +1100, Dave Chinner wrote:
> > /* lock out background commit */
> > down_read(&log->l_cilp->xc_ctx_lock);
> > - if (commit_lsn)
> > - *commit_lsn = log->l_cilp->xc_ctx->sequence;
> > + *commit_lsn = log->l_cilp->xc_ctx->sequence;
> >
> > xlog_cil_insert_items(log, log_vector, tp->t_ticket);
>
> There's a set of reviewed patches (for 3.3) that change all this
> code. The null check might still be there, but that needs to be
> checked.
Which series is that? I mut have to admit I've lost track by now.
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [patch] xfs: remove an unneeded NULL check
2012-02-01 10:45 ` Christoph Hellwig
@ 2012-02-01 21:13 ` Dave Chinner
2012-02-01 21:15 ` Christoph Hellwig
0 siblings, 1 reply; 8+ messages in thread
From: Dave Chinner @ 2012-02-01 21:13 UTC (permalink / raw)
To: Christoph Hellwig
Cc: Alex Elder, kernel-janitors, xfs, xfs-masters, Ben Myers,
Dan Carpenter
On Wed, Feb 01, 2012 at 05:45:01AM -0500, Christoph Hellwig wrote:
> On Wed, Feb 01, 2012 at 09:56:01AM +1100, Dave Chinner wrote:
> > > /* lock out background commit */
> > > down_read(&log->l_cilp->xc_ctx_lock);
> > > - if (commit_lsn)
> > > - *commit_lsn = log->l_cilp->xc_ctx->sequence;
> > > + *commit_lsn = log->l_cilp->xc_ctx->sequence;
> > >
> > > xlog_cil_insert_items(log, log_vector, tp->t_ticket);
> >
> > There's a set of reviewed patches (for 3.3) that change all this
> > code. The null check might still be there, but that needs to be
> > checked.
>
> Which series is that? I mut have to admit I've lost track by now.
The removal of all the old log code.
Cheers,
Dave.
--
Dave Chinner
david@fromorbit.com
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [patch] xfs: remove an unneeded NULL check
2012-02-01 21:13 ` Dave Chinner
@ 2012-02-01 21:15 ` Christoph Hellwig
2012-02-01 23:16 ` Dave Chinner
0 siblings, 1 reply; 8+ messages in thread
From: Christoph Hellwig @ 2012-02-01 21:15 UTC (permalink / raw)
To: Dave Chinner
Cc: Alex Elder, kernel-janitors, xfs, Christoph Hellwig, xfs-masters,
Ben Myers, Dan Carpenter
On Thu, Feb 02, 2012 at 08:13:26AM +1100, Dave Chinner wrote:
> > > There's a set of reviewed patches (for 3.3) that change all this
> > > code. The null check might still be there, but that needs to be
> > > checked.
> >
> > Which series is that? I mut have to admit I've lost track by now.
>
> The removal of all the old log code.
That stuff actually still went into 3.3-rc1.
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [patch] xfs: remove an unneeded NULL check
2012-02-01 21:15 ` Christoph Hellwig
@ 2012-02-01 23:16 ` Dave Chinner
0 siblings, 0 replies; 8+ messages in thread
From: Dave Chinner @ 2012-02-01 23:16 UTC (permalink / raw)
To: Christoph Hellwig
Cc: Alex Elder, kernel-janitors, xfs, xfs-masters, Ben Myers,
Dan Carpenter
On Wed, Feb 01, 2012 at 04:15:40PM -0500, Christoph Hellwig wrote:
> On Thu, Feb 02, 2012 at 08:13:26AM +1100, Dave Chinner wrote:
> > > > There's a set of reviewed patches (for 3.3) that change all this
> > > > code. The null check might still be there, but that needs to be
> > > > checked.
> > >
> > > Which series is that? I mut have to admit I've lost track by now.
> >
> > The removal of all the old log code.
>
> That stuff actually still went into 3.3-rc1.
Hmmm. That means my cscope trees are not automatically updating
properly for some reason. That's my problem, sorry for the noise.
Cheers,
Dave.
--
Dave Chinner
david@fromorbit.com
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2012-02-01 23:16 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-28 10:55 [patch] xfs: remove an unneeded NULL check Dan Carpenter
2012-01-31 22:04 ` [NOTES] " Phil White
2012-01-31 22:56 ` Dave Chinner
2012-01-31 23:08 ` Ben Myers
2012-02-01 10:45 ` Christoph Hellwig
2012-02-01 21:13 ` Dave Chinner
2012-02-01 21:15 ` Christoph Hellwig
2012-02-01 23:16 ` Dave Chinner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox