diff --git a/[refs] b/[refs] index 40310cb63a9b..70d21f2132f3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4fb6de2561d5c47f3539a7b412108164d79fbb96 +refs/heads/master: d6b54841f4ddd836c886d1e6ac381cf309ee98a3 diff --git a/trunk/fs/minix/dir.c b/trunk/fs/minix/dir.c index f70433816a38..d4946c4c90e2 100644 --- a/trunk/fs/minix/dir.c +++ b/trunk/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)