Commit 175787e0 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'gfs2-for-5.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2

Pull gfs2 fixes from Andreas Gruenbacher:

 - Fix a bug in Abhi Das's journal head lookup improvements that can
   cause a valid journal to be rejected.

 - Fix an O_SYNC write handling bug reported by Christoph Hellwig.

* tag 'gfs2-for-5.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
  gfs2: fix O_SYNC write handling
  gfs2: move setting current->backing_dev_info
  gfs2: fix gfs2_find_jhead that returns uninitialized jhead with seq 0
parents 60ea27e9 6e5e41e2
...@@ -847,7 +847,7 @@ static ssize_t gfs2_file_write_iter(struct kiocb *iocb, struct iov_iter *from) ...@@ -847,7 +847,7 @@ static ssize_t gfs2_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
struct file *file = iocb->ki_filp; struct file *file = iocb->ki_filp;
struct inode *inode = file_inode(file); struct inode *inode = file_inode(file);
struct gfs2_inode *ip = GFS2_I(inode); struct gfs2_inode *ip = GFS2_I(inode);
ssize_t written = 0, ret; ssize_t ret;
ret = gfs2_rsqa_alloc(ip); ret = gfs2_rsqa_alloc(ip);
if (ret) if (ret)
...@@ -867,68 +867,58 @@ static ssize_t gfs2_file_write_iter(struct kiocb *iocb, struct iov_iter *from) ...@@ -867,68 +867,58 @@ static ssize_t gfs2_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
inode_lock(inode); inode_lock(inode);
ret = generic_write_checks(iocb, from); ret = generic_write_checks(iocb, from);
if (ret <= 0) if (ret <= 0)
goto out; goto out_unlock;
/* We can write back this queue in page reclaim */
current->backing_dev_info = inode_to_bdi(inode);
ret = file_remove_privs(file); ret = file_remove_privs(file);
if (ret) if (ret)
goto out2; goto out_unlock;
ret = file_update_time(file); ret = file_update_time(file);
if (ret) if (ret)
goto out2; goto out_unlock;
if (iocb->ki_flags & IOCB_DIRECT) { if (iocb->ki_flags & IOCB_DIRECT) {
struct address_space *mapping = file->f_mapping; struct address_space *mapping = file->f_mapping;
loff_t pos, endbyte; ssize_t buffered, ret2;
ssize_t buffered;
written = gfs2_file_direct_write(iocb, from); ret = gfs2_file_direct_write(iocb, from);
if (written < 0 || !iov_iter_count(from)) if (ret < 0 || !iov_iter_count(from))
goto out2; goto out_unlock;
ret = iomap_file_buffered_write(iocb, from, &gfs2_iomap_ops); iocb->ki_flags |= IOCB_DSYNC;
if (unlikely(ret < 0)) current->backing_dev_info = inode_to_bdi(inode);
goto out2; buffered = iomap_file_buffered_write(iocb, from, &gfs2_iomap_ops);
buffered = ret; current->backing_dev_info = NULL;
if (unlikely(buffered <= 0))
goto out_unlock;
/* /*
* We need to ensure that the page cache pages are written to * We need to ensure that the page cache pages are written to
* disk and invalidated to preserve the expected O_DIRECT * disk and invalidated to preserve the expected O_DIRECT
* semantics. * semantics. If the writeback or invalidate fails, only report
* the direct I/O range as we don't know if the buffered pages
* made it to disk.
*/ */
pos = iocb->ki_pos;
endbyte = pos + buffered - 1;
ret = filemap_write_and_wait_range(mapping, pos, endbyte);
if (!ret) {
iocb->ki_pos += buffered; iocb->ki_pos += buffered;
written += buffered; ret2 = generic_write_sync(iocb, buffered);
invalidate_mapping_pages(mapping, invalidate_mapping_pages(mapping,
pos >> PAGE_SHIFT, (iocb->ki_pos - buffered) >> PAGE_SHIFT,
endbyte >> PAGE_SHIFT); (iocb->ki_pos - 1) >> PAGE_SHIFT);
} else { if (!ret || ret2 > 0)
/* ret += ret2;
* We don't know how much we wrote, so just return
* the number of bytes which were direct-written
*/
}
} else { } else {
current->backing_dev_info = inode_to_bdi(inode);
ret = iomap_file_buffered_write(iocb, from, &gfs2_iomap_ops); ret = iomap_file_buffered_write(iocb, from, &gfs2_iomap_ops);
if (likely(ret > 0))
iocb->ki_pos += ret;
}
out2:
current->backing_dev_info = NULL; current->backing_dev_info = NULL;
out:
inode_unlock(inode);
if (likely(ret > 0)) { if (likely(ret > 0)) {
/* Handle various SYNC-type writes */ iocb->ki_pos += ret;
ret = generic_write_sync(iocb, ret); ret = generic_write_sync(iocb, ret);
} }
return written ? written : ret; }
out_unlock:
inode_unlock(inode);
return ret;
} }
static int fallocate_chunk(struct inode *inode, loff_t offset, loff_t len, static int fallocate_chunk(struct inode *inode, loff_t offset, loff_t len,
......
...@@ -422,7 +422,7 @@ static bool gfs2_jhead_pg_srch(struct gfs2_jdesc *jd, ...@@ -422,7 +422,7 @@ static bool gfs2_jhead_pg_srch(struct gfs2_jdesc *jd,
for (offset = 0; offset < PAGE_SIZE; offset += sdp->sd_sb.sb_bsize) { for (offset = 0; offset < PAGE_SIZE; offset += sdp->sd_sb.sb_bsize) {
if (!__get_log_header(sdp, kaddr + offset, 0, &lh)) { if (!__get_log_header(sdp, kaddr + offset, 0, &lh)) {
if (lh.lh_sequence > head->lh_sequence) if (lh.lh_sequence >= head->lh_sequence)
*head = lh; *head = lh;
else { else {
ret = true; ret = true;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment