diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-08-27 08:04:24 -0700 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-08-27 08:05:17 -0700 |
| commit | 66a61fc0b2c3475f26f65b5f29ed5945b8efbf9e (patch) | |
| tree | 28ebaaee56786cd9199e0e5802d166474d30d1e3 /fs/jbd2/commit.c | |
| parent | 8db089d1b08209c04cd130e49fa4796b5513ce7f (diff) | |
| parent | d37e44969e60dc652fdbaf4397d5436e07c967af (diff) | |
Merge branch 'master' into upstream
Sync with Linus' tree so that we don't have build falures
due to Quanta 3001 ID reshuffling.
Diffstat (limited to 'fs/jbd2/commit.c')
| -rw-r--r-- | fs/jbd2/commit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index 216f4299f65..af5280fb579 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c @@ -349,12 +349,12 @@ static void jbd2_block_tag_csum_set(journal_t *j, journal_block_tag_t *tag, return; sequence = cpu_to_be32(sequence); - addr = kmap_atomic(page, KM_USER0); + addr = kmap_atomic(page); csum = jbd2_chksum(j, j->j_csum_seed, (__u8 *)&sequence, sizeof(sequence)); csum = jbd2_chksum(j, csum, addr + offset_in_page(bh->b_data), bh->b_size); - kunmap_atomic(addr, KM_USER0); + kunmap_atomic(addr); tag->t_checksum = cpu_to_be32(csum); } |