From: Taesoo Kim <taesoo@gatech.edu>
To: Fabian Frederick <fabf@skynet.be>
Cc: akpm@linux-foundation.org, Taesoo Kim <tsgatesv@gmail.com>,
linux-kernel@vger.kernel.org, viro@zeniv.linux.org.uk,
jack@suse.cz, geert@linux-m68k.org,
linux-fsdevel@vger.kernel.org, csong84@gatech.edu,
blee@gatech.edu, sanidhya@gatech.edu, changwoo@gatech.edu
Subject: Re: [PATCH 1/1] fs/affs/file.c: unlock/release page on error
Date: Sat, 21 Mar 2015 16:05:04 -0400 [thread overview]
Message-ID: <20150321200504.GB5170@taesoo.org> (raw)
In-Reply-To: <2067582645.204975.1426967515410.open-xchange@webmail.nmp.proximus.be>
Thank you for letting us know. We will definitely do it for
the next time. Thanks again for checking this out.
Taesoo
On 03/21/15 at 08:51pm, Fabian Frederick wrote:
>
>
> > On 21 March 2015 at 18:31 Taesoo Kim <tsgatesv@gmail.com> wrote:
> >
> >
> > When affs_bread_ino() fails, correctly unlock the page and
> > release the page cache with proper error value. All write_end()
> > should unlock/release the page that was locked by write_beg().
> >
> > Signed-off-by: Taesoo Kim <tsgatesv@gmail.com>
> > ---
> > fs/affs/file.c | 19 ++++++++++++-------
> > 1 file changed, 12 insertions(+), 7 deletions(-)
> >
> > diff --git a/fs/affs/file.c b/fs/affs/file.c
> > index d2468bf..a91795e 100644
> > --- a/fs/affs/file.c
> > +++ b/fs/affs/file.c
> > @@ -699,8 +699,10 @@ static int affs_write_end_ofs(struct file *file, struct
> > address_space *mapping,
> > boff = tmp % bsize;
> > if (boff) {
> > bh = affs_bread_ino(inode, bidx, 0);
> > - if (IS_ERR(bh))
> > - return PTR_ERR(bh);
> > + if (IS_ERR(bh)) {
> > + written = PTR_ERR(bh);
> > + goto err_first_bh;
> > + }
> > tmp = min(bsize - boff, to - from);
> > BUG_ON(boff + tmp > bsize || tmp > bsize);
> > memcpy(AFFS_DATA(bh) + boff, data + from, tmp);
> > @@ -712,14 +714,16 @@ static int affs_write_end_ofs(struct file *file, struct
> > address_space *mapping,
> > bidx++;
> > } else if (bidx) {
> > bh = affs_bread_ino(inode, bidx - 1, 0);
> > - if (IS_ERR(bh))
> > - return PTR_ERR(bh);
> > + if (IS_ERR(bh)) {
> > + written = PTR_ERR(bh);
> > + goto err_first_bh;
> > + }
> > }
> > while (from + bsize <= to) {
> > prev_bh = bh;
> > bh = affs_getemptyblk_ino(inode, bidx);
> > if (IS_ERR(bh))
> > - goto out;
> > + goto err_bh;
> > memcpy(AFFS_DATA(bh), data + from, bsize);
> > if (buffer_new(bh)) {
> > AFFS_DATA_HEAD(bh)->ptype = cpu_to_be32(T_DATA);
> > @@ -751,7 +755,7 @@ static int affs_write_end_ofs(struct file *file, struct
> > address_space *mapping,
> > prev_bh = bh;
> > bh = affs_bread_ino(inode, bidx, 1);
> > if (IS_ERR(bh))
> > - goto out;
> > + goto err_bh;
> > tmp = min(bsize, to - from);
> > BUG_ON(tmp > bsize);
> > memcpy(AFFS_DATA(bh), data + from, tmp);
> > @@ -790,12 +794,13 @@ done:
> > if (tmp > inode->i_size)
> > inode->i_size = AFFS_I(inode)->mmu_private = tmp;
> >
> > +err_first_bh:
> > unlock_page(page);
> > page_cache_release(page);
> >
> > return written;
> >
> > -out:
> > +err_bh:
> > bh = prev_bh;
> > if (!written)
> > written = PTR_ERR(bh);
> > --
> > 2.3.3
> >
>
> Hi Taesoo,
>
> Your patch is ok for me but we generally send a new message
> for an update with the version in title and explain updates
> done to it after ---. Here's an example of an AFFS V2 patch:
>
> http://marc.info/?l=linux-kernel&m=142316316001752&w=2
>
> Regards,
> Fabian
next prev parent reply other threads:[~2015-03-21 20:05 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-21 17:31 Taesoo Kim
2015-03-21 19:51 ` Fabian Frederick
2015-03-21 20:05 ` Taesoo Kim [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-03-20 3:19 Taesoo Kim
2015-03-20 21:13 ` Fabian Frederick
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=20150321200504.GB5170@taesoo.org \
--to=taesoo@gatech.edu \
--cc=akpm@linux-foundation.org \
--cc=blee@gatech.edu \
--cc=changwoo@gatech.edu \
--cc=csong84@gatech.edu \
--cc=fabf@skynet.be \
--cc=geert@linux-m68k.org \
--cc=jack@suse.cz \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sanidhya@gatech.edu \
--cc=tsgatesv@gmail.com \
--cc=viro@zeniv.linux.org.uk \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome