diff options
| author | Joel Becker <joel.becker@oracle.com> | 2010-05-18 16:40:42 -0700 |
|---|---|---|
| committer | Joel Becker <joel.becker@oracle.com> | 2010-05-18 16:40:42 -0700 |
| commit | 41841b0bcea8af7f3bff8b2a23d542b94d9c1bb1 (patch) | |
| tree | 89eddf2dffadbbd13939f94eb8cd904a26279390 /fs/ocfs2/namei.c | |
| parent | 316ce2ba8e74a7bb9153b9f93adc883cb1ceb9fd (diff) | |
| parent | 1a934c3e57594588c373aea858e4593cdfcba4f4 (diff) | |
| download | linux-3.10-41841b0bcea8af7f3bff8b2a23d542b94d9c1bb1.tar.gz linux-3.10-41841b0bcea8af7f3bff8b2a23d542b94d9c1bb1.tar.bz2 linux-3.10-41841b0bcea8af7f3bff8b2a23d542b94d9c1bb1.zip | |
Merge branch 'discontig-bg' of git://oss.oracle.com/git/tma/linux-2.6 into ocfs2-merge-window
Diffstat (limited to 'fs/ocfs2/namei.c')
| -rw-r--r-- | fs/ocfs2/namei.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c index 607084b349d..b0fa6b65075 100644 --- a/fs/ocfs2/namei.c +++ b/fs/ocfs2/namei.c @@ -480,14 +480,15 @@ static int ocfs2_mknod_locked(struct ocfs2_super *osb, int status = 0; struct ocfs2_dinode *fe = NULL; struct ocfs2_extent_list *fel; - u64 fe_blkno = 0; + u64 suballoc_loc, fe_blkno = 0; u16 suballoc_bit; u16 feat; *new_fe_bh = NULL; - status = ocfs2_claim_new_inode(osb, handle, dir, parent_fe_bh, - inode_ac, &suballoc_bit, &fe_blkno); + status = ocfs2_claim_new_inode(handle, dir, parent_fe_bh, + inode_ac, &suballoc_loc, + &suballoc_bit, &fe_blkno); if (status < 0) { mlog_errno(status); goto leave; @@ -524,6 +525,7 @@ static int ocfs2_mknod_locked(struct ocfs2_super *osb, fe->i_generation = cpu_to_le32(inode->i_generation); fe->i_fs_generation = cpu_to_le32(osb->fs_generation); fe->i_blkno = cpu_to_le64(fe_blkno); + fe->i_suballoc_loc = cpu_to_le64(suballoc_loc); fe->i_suballoc_bit = cpu_to_le16(suballoc_bit); fe->i_suballoc_slot = cpu_to_le16(inode_ac->ac_alloc_slot); fe->i_uid = cpu_to_le32(inode->i_uid); |