| Message ID | 1426821586-10552-1-git-send-email-tsgatesv@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
> On 20 March 2015 at 04:19 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 | 13 +++++++++---- > 1 file changed, 9 insertions(+), 4 deletions(-) > > diff --git a/fs/affs/file.c b/fs/affs/file.c > index d2468bf..15d07a0 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; > + } > tmp = min(bsize - boff, to - from); > BUG_ON(boff + tmp > bsize || tmp > bsize); > memcpy(AFFS_DATA(bh) + boff, data + from, tmp); > @@ -712,8 +714,10 @@ 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; > + } > } > while (from + bsize <= to) { > prev_bh = bh; > @@ -790,6 +794,7 @@ done: > if (tmp > inode->i_size) > inode->i_size = AFFS_I(inode)->mmu_private = tmp; > > +err: > unlock_page(page); > page_cache_release(page); > > -- > 2.3.3 > Patch looks good. Maybe you could use more explicit labels like err_first_bh instead of err err_bh instead of out Regards, Fabian -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/affs/file.c b/fs/affs/file.c index d2468bf..15d07a0 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; + } tmp = min(bsize - boff, to - from); BUG_ON(boff + tmp > bsize || tmp > bsize); memcpy(AFFS_DATA(bh) + boff, data + from, tmp); @@ -712,8 +714,10 @@ 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; + } } while (from + bsize <= to) { prev_bh = bh; @@ -790,6 +794,7 @@ done: if (tmp > inode->i_size) inode->i_size = AFFS_I(inode)->mmu_private = tmp; +err: unlock_page(page); page_cache_release(page);
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 | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)