diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-11 03:43:52 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-11 03:43:52 +0100 |
| commit | 99cd7074891f87c49660e3b2880564324a4733ac (patch) | |
| tree | 903d2665bcb445f1f265d1adf7a99f265bcefc15 /fs/minix/dir.c | |
| parent | e8a9cbf6ae620d9e5ba9cb42001c033287a284a3 (diff) | |
| parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
Merge commit 'v2.6.29-rc1' into tracing/urgent
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 f70433816a3..d4946c4c90e 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) return -EINVAL; got_it: - pos = (page->index >> PAGE_CACHE_SHIFT) + p - (char*)page_address(page); + pos = page_offset(page) + p - (char *)page_address(page); err = __minix_write_begin(NULL, page->mapping, pos, sbi->s_dirsize, AOP_FLAG_UNINTERRUPTIBLE, &page, NULL); if (err) |