diff options
author | Joel Becker <joel.becker@oracle.com> | 2010-05-18 19:40:42 -0400 |
---|---|---|
committer | Joel Becker <joel.becker@oracle.com> | 2010-05-18 19:40:42 -0400 |
commit | 41841b0bcea8af7f3bff8b2a23d542b94d9c1bb1 (patch) | |
tree | 89eddf2dffadbbd13939f94eb8cd904a26279390 /fs/ocfs2/namei.c | |
parent | 316ce2ba8e74a7bb9153b9f93adc883cb1ceb9fd (diff) | |
parent | 1a934c3e57594588c373aea858e4593cdfcba4f4 (diff) |
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 607084b349d4..b0fa6b650751 100644 --- a/fs/ocfs2/namei.c +++ b/fs/ocfs2/namei.c | |||
@@ -480,14 +480,15 @@ static int ocfs2_mknod_locked(struct ocfs2_super *osb, | |||
480 | int status = 0; | 480 | int status = 0; |
481 | struct ocfs2_dinode *fe = NULL; | 481 | struct ocfs2_dinode *fe = NULL; |
482 | struct ocfs2_extent_list *fel; | 482 | struct ocfs2_extent_list *fel; |
483 | u64 fe_blkno = 0; | 483 | u64 suballoc_loc, fe_blkno = 0; |
484 | u16 suballoc_bit; | 484 | u16 suballoc_bit; |
485 | u16 feat; | 485 | u16 feat; |
486 | 486 | ||
487 | *new_fe_bh = NULL; | 487 | *new_fe_bh = NULL; |
488 | 488 | ||
489 | status = ocfs2_claim_new_inode(osb, handle, dir, parent_fe_bh, | 489 | status = ocfs2_claim_new_inode(handle, dir, parent_fe_bh, |
490 | inode_ac, &suballoc_bit, &fe_blkno); | 490 | inode_ac, &suballoc_loc, |
491 | &suballoc_bit, &fe_blkno); | ||
491 | if (status < 0) { | 492 | if (status < 0) { |
492 | mlog_errno(status); | 493 | mlog_errno(status); |
493 | goto leave; | 494 | goto leave; |
@@ -524,6 +525,7 @@ static int ocfs2_mknod_locked(struct ocfs2_super *osb, | |||
524 | fe->i_generation = cpu_to_le32(inode->i_generation); | 525 | fe->i_generation = cpu_to_le32(inode->i_generation); |
525 | fe->i_fs_generation = cpu_to_le32(osb->fs_generation); | 526 | fe->i_fs_generation = cpu_to_le32(osb->fs_generation); |
526 | fe->i_blkno = cpu_to_le64(fe_blkno); | 527 | fe->i_blkno = cpu_to_le64(fe_blkno); |
528 | fe->i_suballoc_loc = cpu_to_le64(suballoc_loc); | ||
527 | fe->i_suballoc_bit = cpu_to_le16(suballoc_bit); | 529 | fe->i_suballoc_bit = cpu_to_le16(suballoc_bit); |
528 | fe->i_suballoc_slot = cpu_to_le16(inode_ac->ac_alloc_slot); | 530 | fe->i_suballoc_slot = cpu_to_le16(inode_ac->ac_alloc_slot); |
529 | fe->i_uid = cpu_to_le32(inode->i_uid); | 531 | fe->i_uid = cpu_to_le32(inode->i_uid); |