diff options
| author | Mark Brown <broonie@kernel.org> | 2016-05-02 12:02:09 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-05-02 12:02:09 +0100 |
| commit | 0ce8428ba9ea13098b828d0881e28368a108709c (patch) | |
| tree | 12cbe5d9c27319b8a18ac9fc9cb44e3c5f35408c /fs/nilfs2/segment.c | |
| parent | fba0d7066524ab7b8ccf60e7e95981d10ed008b0 (diff) | |
| parent | 8c0f55100478649e3c0133684aa4aebab77ce10f (diff) | |
Merge tag 'asoc-fix-v4.6-rc5' into asoc-intel
ASoC: Fixes for v4.6
This is a fairly large collection of fixes but almost all driver
specific ones, especially to the new Intel drivers which have had a lot
of recent development. The one core fix is a change to the debugfs code
to avoid crashes in some relatively unusual configurations.
Diffstat (limited to 'fs/nilfs2/segment.c')
| -rw-r--r-- | fs/nilfs2/segment.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c index 3b65adaae7e4..4317f72568e6 100644 --- a/fs/nilfs2/segment.c +++ b/fs/nilfs2/segment.c @@ -2070,7 +2070,7 @@ static int nilfs_segctor_do_construct(struct nilfs_sc_info *sci, int mode) goto failed_to_write; if (nilfs_sc_cstage_get(sci) == NILFS_ST_DONE || - nilfs->ns_blocksize_bits != PAGE_CACHE_SHIFT) { + nilfs->ns_blocksize_bits != PAGE_SHIFT) { /* * At this point, we avoid double buffering * for blocksize < pagesize because page dirty |