diff options
| author | Joel Becker <joel.becker@oracle.com> | 2010-03-26 10:09:15 +0800 |
|---|---|---|
| committer | Tao Ma <tao.ma@oracle.com> | 2010-03-26 10:09:15 +0800 |
| commit | 2b6cb576aa80611f1f6a3c88708d1e68a8d97985 (patch) | |
| tree | a984f09104970133379e4d370b9f01e7f85c6f9b /fs/ocfs2/dir.c | |
| parent | ba2066351b630f0205ebf725f5c81a2a07a77cd7 (diff) | |
| download | kernel_samsung_smdk4412-2b6cb576aa80611f1f6a3c88708d1e68a8d97985.zip kernel_samsung_smdk4412-2b6cb576aa80611f1f6a3c88708d1e68a8d97985.tar.gz kernel_samsung_smdk4412-2b6cb576aa80611f1f6a3c88708d1e68a8d97985.tar.bz2 | |
ocfs2: Set suballoc_loc on allocated metadata.
Get the suballoc_loc from ocfs2_claim_new_inode() or
ocfs2_claim_metadata(). Store it on the appropriate field of the block
we just allocated.
Signed-off-by: Joel Becker <joel.becker@oracle.com>
Diffstat (limited to 'fs/ocfs2/dir.c')
| -rw-r--r-- | fs/ocfs2/dir.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c index 02c3f22..341bb8f 100644 --- a/fs/ocfs2/dir.c +++ b/fs/ocfs2/dir.c @@ -2395,15 +2395,15 @@ static int ocfs2_dx_dir_attach_index(struct ocfs2_super *osb, int ret; struct ocfs2_dinode *di = (struct ocfs2_dinode *) di_bh->b_data; u16 dr_suballoc_bit; - u64 dr_blkno; + u64 suballoc_loc, dr_blkno; unsigned int num_bits; struct buffer_head *dx_root_bh = NULL; struct ocfs2_dx_root_block *dx_root; struct ocfs2_dir_block_trailer *trailer = ocfs2_trailer_from_bh(dirdata_bh, dir->i_sb); - ret = ocfs2_claim_metadata(handle, meta_ac, 1, &dr_suballoc_bit, - &num_bits, &dr_blkno); + ret = ocfs2_claim_metadata(handle, meta_ac, 1, &suballoc_loc, + &dr_suballoc_bit, &num_bits, &dr_blkno); if (ret) { mlog_errno(ret); goto out; @@ -2431,6 +2431,7 @@ static int ocfs2_dx_dir_attach_index(struct ocfs2_super *osb, memset(dx_root, 0, osb->sb->s_blocksize); strcpy(dx_root->dr_signature, OCFS2_DX_ROOT_SIGNATURE); dx_root->dr_suballoc_slot = cpu_to_le16(meta_ac->ac_alloc_slot); + dx_root->dr_suballoc_loc = cpu_to_le64(suballoc_loc); dx_root->dr_suballoc_bit = cpu_to_le16(dr_suballoc_bit); dx_root->dr_fs_generation = cpu_to_le32(osb->fs_generation); dx_root->dr_blkno = cpu_to_le64(dr_blkno); |