diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-01-12 03:40:48 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-01-12 03:40:48 -0500 |
| commit | dba9532388b00d591d87c638a47dcc7ba3763fc5 (patch) | |
| tree | cc9de8cbc40d0e927b1924d1d943208e84e21d1f /fs/nilfs2/bmap.c | |
| parent | 78b8d5d2ee280c463908fd75f3bdf246bcb6ac8d (diff) | |
| parent | c68db7175f4dcb3d5789bb50bea6376fb81f87fe (diff) | |
Merge remote branch 'alsa/fixes' into fix/misc
Diffstat (limited to 'fs/nilfs2/bmap.c')
| -rw-r--r-- | fs/nilfs2/bmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nilfs2/bmap.c b/fs/nilfs2/bmap.c index f4a14ea2ed9c..effdbdbe6c11 100644 --- a/fs/nilfs2/bmap.c +++ b/fs/nilfs2/bmap.c | |||
| @@ -417,8 +417,8 @@ __u64 nilfs_bmap_data_get_key(const struct nilfs_bmap *bmap, | |||
| 417 | 417 | ||
| 418 | key = page_index(bh->b_page) << (PAGE_CACHE_SHIFT - | 418 | key = page_index(bh->b_page) << (PAGE_CACHE_SHIFT - |
| 419 | bmap->b_inode->i_blkbits); | 419 | bmap->b_inode->i_blkbits); |
| 420 | for (pbh = page_buffers(bh->b_page); pbh != bh; | 420 | for (pbh = page_buffers(bh->b_page); pbh != bh; pbh = pbh->b_this_page) |
| 421 | pbh = pbh->b_this_page, key++); | 421 | key++; |
| 422 | 422 | ||
| 423 | return key; | 423 | return key; |
| 424 | } | 424 | } |