| From 2c10f7525067ab722d86ed8c8ba9de2acbcf023c Mon Sep 17 00:00:00 2001 |
| From: Christoph Hellwig <hch@lst.de> |
| Date: Wed, 15 Jan 2020 16:38:29 +0100 |
| Subject: [PATCH] gfs2: move setting current->backing_dev_info |
| |
| commit 4c0e8dda608a51855225c611b5c6b442f95fbc56 upstream. |
| |
| Set current->backing_dev_info just around the buffered write calls to |
| prepare for the next fix. |
| |
| Fixes: 967bcc91b044 ("gfs2: iomap direct I/O support") |
| Cc: stable@vger.kernel.org # v4.19+ |
| Signed-off-by: Christoph Hellwig <hch@lst.de> |
| Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c |
| index 9af9d4a8204d..13d3342ef03a 100644 |
| --- a/fs/gfs2/file.c |
| +++ b/fs/gfs2/file.c |
| @@ -837,18 +837,15 @@ static ssize_t gfs2_file_write_iter(struct kiocb *iocb, struct iov_iter *from) |
| inode_lock(inode); |
| ret = generic_write_checks(iocb, from); |
| if (ret <= 0) |
| - goto out; |
| - |
| - /* We can write back this queue in page reclaim */ |
| - current->backing_dev_info = inode_to_bdi(inode); |
| + goto out_unlock; |
| |
| ret = file_remove_privs(file); |
| if (ret) |
| - goto out2; |
| + goto out_unlock; |
| |
| ret = file_update_time(file); |
| if (ret) |
| - goto out2; |
| + goto out_unlock; |
| |
| if (iocb->ki_flags & IOCB_DIRECT) { |
| struct address_space *mapping = file->f_mapping; |
| @@ -857,11 +854,13 @@ static ssize_t gfs2_file_write_iter(struct kiocb *iocb, struct iov_iter *from) |
| |
| written = gfs2_file_direct_write(iocb, from); |
| if (written < 0 || !iov_iter_count(from)) |
| - goto out2; |
| + goto out_unlock; |
| |
| + current->backing_dev_info = inode_to_bdi(inode); |
| ret = iomap_file_buffered_write(iocb, from, &gfs2_iomap_ops); |
| + current->backing_dev_info = NULL; |
| if (unlikely(ret < 0)) |
| - goto out2; |
| + goto out_unlock; |
| buffered = ret; |
| |
| /* |
| @@ -885,14 +884,14 @@ static ssize_t gfs2_file_write_iter(struct kiocb *iocb, struct iov_iter *from) |
| */ |
| } |
| } else { |
| + current->backing_dev_info = inode_to_bdi(inode); |
| ret = iomap_file_buffered_write(iocb, from, &gfs2_iomap_ops); |
| + current->backing_dev_info = NULL; |
| if (likely(ret > 0)) |
| iocb->ki_pos += ret; |
| } |
| |
| -out2: |
| - current->backing_dev_info = NULL; |
| -out: |
| +out_unlock: |
| inode_unlock(inode); |
| if (likely(ret > 0)) { |
| /* Handle various SYNC-type writes */ |
| -- |
| 2.7.4 |
| |