Messages in this thread | | | Date | Wed, 20 Jun 2012 14:56:59 -0700 | From | Andrew Morton <> | Subject | Re: BUG in ofcs2_change_file_space |
| |
On Wed, 20 Jun 2012 19:01:30 +0100 Luis Henriques <luis.henriques@canonical.com> wrote:
> >> a patch has been available for this for a while now > >> found here: http://oss.oracle.com/pipermail/ocfs2-devel/2012-January/008464.html > >> but it still has not hit mainline > >> is there any way we can get this included? > > I believe something like this would be more appropriated, as a NULL as the > 'file' parameter seems to be valid in that context: > > --- > fs/ocfs2/file.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c > index 6e39668..84822a4 100644 > --- a/fs/ocfs2/file.c > +++ b/fs/ocfs2/file.c > @@ -1950,7 +1950,7 @@ static int __ocfs2_change_file_space(struct file *file, struct inode *inode, > if (ret < 0) > mlog_errno(ret); > > - if (file->f_flags & O_SYNC) > + if (file && (file->f_flags & O_SYNC)) > handle->h_sync = 1; > > ocfs2_commit_trans(osb, handle);
Sunil, does this look OK to you? And Bret, can you please test it?
Luis, can you please prepare a proper, signed-off, changelogged version of this and I'll grab it, thanks.
I'm not seeing any OCFS2 activity in mainline from Joel and Mark in six months, so I'm getting those i-have-a-new-subsystem-to-maintain feelings.
If anyone else has any urgent OCFS2 patches then please resend them, cc myself and cc linux-kernel.
| |