summaryrefslogtreecommitdiffstats
path: root/fs/ocfs2
diff options
context:
space:
mode:
authorMark Fasheh <mark.fasheh@oracle.com>2007-10-04 14:47:09 -0700
committerMark Fasheh <mark.fasheh@oracle.com>2007-10-12 11:54:33 -0700
commit19b613d41051296be628581e7e21b847e9eaba80 (patch)
tree9b5adabc3d3ef6b478e54b2a44aac3aca38cea33 /fs/ocfs2
parent015452b15ff6c2d9fa1f82f28d61e7a66e2df86a (diff)
downloadblackbird-op-linux-19b613d41051296be628581e7e21b847e9eaba80.tar.gz
blackbird-op-linux-19b613d41051296be628581e7e21b847e9eaba80.zip
ocfs2: Clear slot map when umounting a local volume
This is technically harmless (recovery will clean it out later), but leaves a bogus entry in the slot_map which really shouldn't be there. Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to 'fs/ocfs2')
-rw-r--r--fs/ocfs2/super.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index c034b5129c1e..19436d1ff57f 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -1209,12 +1209,13 @@ static void ocfs2_dismount_volume(struct super_block *sb, int mnt_err)
tmp = ocfs2_request_umount_vote(osb);
if (tmp < 0)
mlog_errno(tmp);
+ }
- if (osb->slot_num != OCFS2_INVALID_SLOT)
- ocfs2_put_slot(osb);
+ if (osb->slot_num != OCFS2_INVALID_SLOT)
+ ocfs2_put_slot(osb);
+ if (osb->dlm)
ocfs2_super_unlock(osb, 1);
- }
ocfs2_release_system_inodes(osb);
OpenPOWER on IntegriCloud