diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-06 14:31:06 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-06 14:31:06 +0100 |
| commit | 626c75a01521adc3a71b43d49d4db3d956c41b9f (patch) | |
| tree | ccd5afb442f5c1763e051b6f4359bde25e1bb373 /fs | |
| parent | 7d89516d246691c9a82e75563294df01b768f1d6 (diff) | |
| parent | a3dfd8c06351968f2ec42feb1ae8dfab8b481225 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/bio.c | 4 | ||||
| -rw-r--r-- | fs/sysv/super.c | 1 |
2 files changed, 3 insertions, 2 deletions
@@ -917,8 +917,8 @@ void bio_copy_data(struct bio *dst, struct bio *src) src_p = kmap_atomic(src_bv->bv_page); dst_p = kmap_atomic(dst_bv->bv_page); - memcpy(dst_p + dst_bv->bv_offset, - src_p + src_bv->bv_offset, + memcpy(dst_p + dst_offset, + src_p + src_offset, bytes); kunmap_atomic(dst_p); diff --git a/fs/sysv/super.c b/fs/sysv/super.c index d0c6a007ce8..eda10959714 100644 --- a/fs/sysv/super.c +++ b/fs/sysv/super.c @@ -487,6 +487,7 @@ static int v7_fill_super(struct super_block *sb, void *data, int silent) sbi->s_sb = sb; sbi->s_block_base = 0; sbi->s_type = FSTYPE_V7; + mutex_init(&sbi->s_lock); sb->s_fs_info = sbi; sb_set_blocksize(sb, 512); |