Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 22:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

gfs2: move setting current->backing_dev_info

Browse Source 
Set current->backing_dev_info just around the buffered write calls to
prepare for the next fix.

Fixes: 967bcc91b0 ("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>
This commit is contained in:
Christoph Hellwig 2020-01-15 16:38:29 +01:00 committed by Andreas Gruenbacher
parent 7582026f6f
commit 4c0e8dda60
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fs/gfs2/file.c
View File

@ -867,18 +867,15 @@ 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;
@ -887,11 +884,13 @@ static ssize_t gfs2_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
written = gfs2_file_direct_write(iocb, from); written = gfs2_file_direct_write(iocb, from);
if (written < 0 || !iov_iter_count(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); ret = iomap_file_buffered_write(iocb, from, &gfs2_iomap_ops);
current->backing_dev_info = NULL;
if (unlikely(ret < 0)) if (unlikely(ret < 0))
goto out2; goto out_unlock;
buffered = ret; buffered = ret;
/* /*
@ -915,14 +914,14 @@ static ssize_t gfs2_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
*/ */
} }
} 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);
current->backing_dev_info = NULL;
if (likely(ret > 0)) if (likely(ret > 0))
iocb->ki_pos += ret; iocb->ki_pos += ret;
} }
out2: out_unlock:
current->backing_dev_info = NULL;
out:
inode_unlock(inode); inode_unlock(inode);
if (likely(ret > 0)) { if (likely(ret > 0)) {
/* Handle various SYNC-type writes */ /* Handle various SYNC-type writes */