diff options
author | Joel Becker <joel.becker@oracle.com> | 2010-05-06 01:59:06 -0400 |
---|---|---|
committer | Tao Ma <tao.ma@oracle.com> | 2010-05-06 01:59:06 -0400 |
commit | 1ed9b777f77929ae961d6f9cdf828a07200ba71c (patch) | |
tree | a0bb6c9e9be1f5d3d46d6cdac0a4397303e22795 /fs/ocfs2/dir.c | |
parent | 13e434cf0cacd2f03a7f4cd077e3e995ef5ef710 (diff) |
ocfs2: ocfs2_claim_*() don't need an ocfs2_super argument.
They all take an ocfs2_alloc_context, which has the allocation inode.
Signed-off-by: Joel Becker <joel.becker@oracle.com>
Signed-off-by: Tao Ma <tao.ma@oracle.com>
Diffstat (limited to 'fs/ocfs2/dir.c')
-rw-r--r-- | fs/ocfs2/dir.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c index 6c9a28a2d3ae..02c3f2261550 100644 --- a/fs/ocfs2/dir.c +++ b/fs/ocfs2/dir.c | |||
@@ -2402,7 +2402,7 @@ static int ocfs2_dx_dir_attach_index(struct ocfs2_super *osb, | |||
2402 | struct ocfs2_dir_block_trailer *trailer = | 2402 | struct ocfs2_dir_block_trailer *trailer = |
2403 | ocfs2_trailer_from_bh(dirdata_bh, dir->i_sb); | 2403 | ocfs2_trailer_from_bh(dirdata_bh, dir->i_sb); |
2404 | 2404 | ||
2405 | ret = ocfs2_claim_metadata(osb, handle, meta_ac, 1, &dr_suballoc_bit, | 2405 | ret = ocfs2_claim_metadata(handle, meta_ac, 1, &dr_suballoc_bit, |
2406 | &num_bits, &dr_blkno); | 2406 | &num_bits, &dr_blkno); |
2407 | if (ret) { | 2407 | if (ret) { |
2408 | mlog_errno(ret); | 2408 | mlog_errno(ret); |
@@ -2544,7 +2544,7 @@ static int __ocfs2_dx_dir_new_cluster(struct inode *dir, | |||
2544 | * chance of contiguousness as the directory grows in number | 2544 | * chance of contiguousness as the directory grows in number |
2545 | * of entries. | 2545 | * of entries. |
2546 | */ | 2546 | */ |
2547 | ret = __ocfs2_claim_clusters(osb, handle, data_ac, 1, 1, &phys, &num); | 2547 | ret = __ocfs2_claim_clusters(handle, data_ac, 1, 1, &phys, &num); |
2548 | if (ret) { | 2548 | if (ret) { |
2549 | mlog_errno(ret); | 2549 | mlog_errno(ret); |
2550 | goto out; | 2550 | goto out; |
@@ -2979,7 +2979,7 @@ static int ocfs2_expand_inline_dir(struct inode *dir, struct buffer_head *di_bh, | |||
2979 | */ | 2979 | */ |
2980 | if (ocfs2_dir_resv_allowed(osb)) | 2980 | if (ocfs2_dir_resv_allowed(osb)) |
2981 | data_ac->ac_resv = &oi->ip_la_data_resv; | 2981 | data_ac->ac_resv = &oi->ip_la_data_resv; |
2982 | ret = ocfs2_claim_clusters(osb, handle, data_ac, 1, &bit_off, &len); | 2982 | ret = ocfs2_claim_clusters(handle, data_ac, 1, &bit_off, &len); |
2983 | if (ret) { | 2983 | if (ret) { |
2984 | mlog_errno(ret); | 2984 | mlog_errno(ret); |
2985 | goto out_commit; | 2985 | goto out_commit; |
@@ -3118,7 +3118,7 @@ static int ocfs2_expand_inline_dir(struct inode *dir, struct buffer_head *di_bh, | |||
3118 | * pass. Claim the 2nd cluster as a separate extent. | 3118 | * pass. Claim the 2nd cluster as a separate extent. |
3119 | */ | 3119 | */ |
3120 | if (alloc > len) { | 3120 | if (alloc > len) { |
3121 | ret = ocfs2_claim_clusters(osb, handle, data_ac, 1, &bit_off, | 3121 | ret = ocfs2_claim_clusters(handle, data_ac, 1, &bit_off, |
3122 | &len); | 3122 | &len); |
3123 | if (ret) { | 3123 | if (ret) { |
3124 | mlog_errno(ret); | 3124 | mlog_errno(ret); |