diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 01:02:04 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 01:02:04 -0400 |
| commit | b2382b363df828f25e35ed8b70a3da33b29b2a64 (patch) | |
| tree | 23aa2e70ba4650390c9281b3696172313bdb0f38 /fs/ntfs/aops.c | |
| parent | 1b5cca3a88b7682d538d129c25f0e3092613a243 (diff) | |
| parent | 0572e3da3ff5c3744b2f606ecf296d5f89a4bbdf (diff) | |
Merge upstream into ieee80211.
Hand-fix merge conflict in drivers/usb/net/zd1201.c.
Diffstat (limited to 'fs/ntfs/aops.c')
| -rw-r--r-- | fs/ntfs/aops.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ntfs/aops.c b/fs/ntfs/aops.c index 3f43bfe6184e..78adad7a988d 100644 --- a/fs/ntfs/aops.c +++ b/fs/ntfs/aops.c | |||
| @@ -924,6 +924,7 @@ static int ntfs_write_mst_block(struct page *page, | |||
| 924 | LCN lcn; | 924 | LCN lcn; |
| 925 | unsigned int vcn_ofs; | 925 | unsigned int vcn_ofs; |
| 926 | 926 | ||
| 927 | bh->b_bdev = vol->sb->s_bdev; | ||
| 927 | /* Obtain the vcn and offset of the current block. */ | 928 | /* Obtain the vcn and offset of the current block. */ |
| 928 | vcn = (VCN)block << bh_size_bits; | 929 | vcn = (VCN)block << bh_size_bits; |
| 929 | vcn_ofs = vcn & vol->cluster_size_mask; | 930 | vcn_ofs = vcn & vol->cluster_size_mask; |