diff options
| author | Mark Fasheh <mfasheh@suse.com> | 2008-02-01 20:59:09 +0100 |
|---|---|---|
| committer | Mark Fasheh <mfasheh@suse.com> | 2008-04-18 17:56:02 +0200 |
| commit | 8e8a4603b5422c9145880e73b23bc4c2c4de0098 (patch) | |
| tree | 4d388ae74ed9e5f8cfec19ff20d07d81ca742592 /fs/ocfs2/dlmglue.c | |
| parent | Linux 2.6.25 (diff) | |
| download | linux-8e8a4603b5422c9145880e73b23bc4c2c4de0098.tar.xz linux-8e8a4603b5422c9145880e73b23bc4c2c4de0098.zip | |
ocfs2: Move slot map access into slot_map.c
journal.c and dlmglue.c would refresh the slot map by hand. Instead, have
the update and clear functions do the work inside slot_map.c. The eventual
result is to make ocfs2_slot_info defined privately in slot_map.c
Signed-off-by: Joel Becker <joel.becker@oracle.com>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>
Diffstat (limited to 'fs/ocfs2/dlmglue.c')
| -rw-r--r-- | fs/ocfs2/dlmglue.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c index 1f1873bf41fb..1a80fa9e7c9a 100644 --- a/fs/ocfs2/dlmglue.c +++ b/fs/ocfs2/dlmglue.c @@ -2132,8 +2132,6 @@ int ocfs2_super_lock(struct ocfs2_super *osb, int status = 0; int level = ex ? LKM_EXMODE : LKM_PRMODE; struct ocfs2_lock_res *lockres = &osb->osb_super_lockres; - struct buffer_head *bh; - struct ocfs2_slot_info *si = osb->slot_info; mlog_entry_void(); @@ -2159,11 +2157,7 @@ int ocfs2_super_lock(struct ocfs2_super *osb, goto bail; } if (status) { - bh = si->si_bh; - status = ocfs2_read_block(osb, bh->b_blocknr, &bh, 0, - si->si_inode); - if (status == 0) - ocfs2_update_slot_info(si); + status = ocfs2_refresh_slot_info(osb); ocfs2_complete_lock_res_refresh(lockres, status); |