Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sync up with Linus #97

Merged
merged 10 commits into from
Aug 27, 2015
Merged

Sync up with Linus #97

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a57e456
x86/apic: Fix fallout from x2apic cleanup
KAGA-KOKO Aug 22, 2015
883985f
nfsd: Add Jeff Layton as co-maintainer
Aug 24, 2015
b1713b1
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/l…
torvalds Aug 25, 2015
006a097
writeback: sync_inodes_sb() must write out I_DIRTY_TIME inodes and al…
htejun Aug 25, 2015
74c9c91
mtip32x: fix regression introduced by blk-mq per-hctx flush
JeffMoyer Jul 29, 2015
de4a196
nfit, nd_blk: BLK status register is only 32 bits
Aug 20, 2015
e308fd3
LSM: restore certain default error codes
jbeulich Aug 24, 2015
f045fd7
Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/…
torvalds Aug 26, 2015
f5db4b3
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
torvalds Aug 26, 2015
f9ed72d
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
torvalds Aug 26, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions drivers/block/mtip32xx/mtip32xx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3756,6 +3756,14 @@ static int mtip_init_cmd(void *data, struct request *rq, unsigned int hctx_idx,
struct mtip_cmd *cmd = blk_mq_rq_to_pdu(rq);
u32 host_cap_64 = readl(dd->mmio + HOST_CAP) & HOST_CAP_64;

/*
* For flush requests, request_idx starts at the end of the
* tag space. Since we don't support FLUSH/FUA, simply return
* 0 as there's nothing to be done.
*/
if (request_idx >= MTIP_MAX_COMMAND_SLOTS)
return 0;

cmd->command = dmam_alloc_coherent(&dd->pdev->dev, CMD_DMA_ALLOC_SZ,
&cmd->command_dma, GFP_KERNEL);
if (!cmd->command)
Expand Down
22 changes: 13 additions & 9 deletions fs/fs-writeback.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -844,14 +844,15 @@ static void bdi_split_work_to_wbs(struct backing_dev_info *bdi,
struct wb_iter iter;

might_sleep();

if (!bdi_has_dirty_io(bdi))
return;
restart:
rcu_read_lock();
bdi_for_each_wb(wb, bdi, &iter, next_blkcg_id) {
if (!wb_has_dirty_io(wb) ||
(skip_if_busy && writeback_in_progress(wb)))
/* SYNC_ALL writes out I_DIRTY_TIME too */
if (!wb_has_dirty_io(wb) &&
(base_work->sync_mode == WB_SYNC_NONE ||
list_empty(&wb->b_dirty_time)))
continue;
if (skip_if_busy && writeback_in_progress(wb))
continue;

base_work->nr_pages = wb_split_bdi_pages(wb, nr_pages);
Expand Down Expand Up @@ -899,8 +900,7 @@ static void bdi_split_work_to_wbs(struct backing_dev_info *bdi,
{
might_sleep();

if (bdi_has_dirty_io(bdi) &&
(!skip_if_busy || !writeback_in_progress(&bdi->wb))) {
if (!skip_if_busy || !writeback_in_progress(&bdi->wb)) {
base_work->auto_free = 0;
base_work->single_wait = 0;
base_work->single_done = 0;
Expand Down Expand Up @@ -2275,8 +2275,12 @@ void sync_inodes_sb(struct super_block *sb)
};
struct backing_dev_info *bdi = sb->s_bdi;

/* Nothing to do? */
if (!bdi_has_dirty_io(bdi) || bdi == &noop_backing_dev_info)
/*
* Can't skip on !bdi_has_dirty() because we should wait for !dirty
* inodes under writeback and I_DIRTY_TIME inodes ignored by
* bdi_has_dirty() need to be written out too.
*/
if (bdi == &noop_backing_dev_info)
return;
WARN_ON(!rwsem_is_locked(&sb->s_umount));

Expand Down