diff options
| author | David Vrabel <david.vrabel@csr.com> | 2009-01-07 05:45:25 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2009-01-07 05:45:25 -0500 |
| commit | a23e66f3b8cfdedec14541e71ef29a754870a20c (patch) | |
| tree | f8ac23572982e92e6f8ae09c4039db627bdf53ee /fs/minix/dir.c | |
| parent | 04c470adb01c62bb9bd663cfc4875cf0a4eb01ab (diff) | |
| parent | ede6f5aea054d3fb67c78857f7abdee602302043 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'fs/minix/dir.c')
| -rw-r--r-- | fs/minix/dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/minix/dir.c b/fs/minix/dir.c index f70433816a38..d4946c4c90e2 100644 --- a/fs/minix/dir.c +++ b/fs/minix/dir.c | |||
| @@ -280,7 +280,7 @@ int minix_add_link(struct dentry *dentry, struct inode *inode) | |||
| 280 | return -EINVAL; | 280 | return -EINVAL; |
| 281 | 281 | ||
| 282 | got_it: | 282 | got_it: |
| 283 | pos = (page->index >> PAGE_CACHE_SHIFT) + p - (char*)page_address(page); | 283 | pos = page_offset(page) + p - (char *)page_address(page); |
| 284 | err = __minix_write_begin(NULL, page->mapping, pos, sbi->s_dirsize, | 284 | err = __minix_write_begin(NULL, page->mapping, pos, sbi->s_dirsize, |
| 285 | AOP_FLAG_UNINTERRUPTIBLE, &page, NULL); | 285 | AOP_FLAG_UNINTERRUPTIBLE, &page, NULL); |
| 286 | if (err) | 286 | if (err) |