Unverified Commit 4ad5c924 authored by Konstantin Komarov's avatar Konstantin Komarov
Browse files

fs/ntfs3: Allow repeated call to ntfs3_put_sbi 



Signed-off-by: default avatarKonstantin Komarov <almaz.alexandrovich@paragon-software.com>
parent 3f2f09f1

fs/ntfs3/bitmap.c

+1 −0
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ void wnd_close(struct wnd_bitmap *wnd) 
	struct rb_node *node, *next;



	kfree(wnd->free_bits);

	wnd->free_bits = NULL;

	run_close(&wnd->run);



	node = rb_first(&wnd->start_tree);

fs/ntfs3/super.c

+16 −5
Original line number Diff line number Diff line
@@ -576,20 +576,30 @@ static noinline void ntfs3_put_sbi(struct ntfs_sb_info *sbi) 
	wnd_close(&sbi->mft.bitmap);

	wnd_close(&sbi->used.bitmap);



	if (sbi->mft.ni)

	if (sbi->mft.ni) {

		iput(&sbi->mft.ni->vfs_inode);

		sbi->mft.ni = NULL;

	}



	if (sbi->security.ni)

	if (sbi->security.ni) {

		iput(&sbi->security.ni->vfs_inode);

		sbi->security.ni = NULL;

	}



	if (sbi->reparse.ni)

	if (sbi->reparse.ni) {

		iput(&sbi->reparse.ni->vfs_inode);

		sbi->reparse.ni = NULL;

	}



	if (sbi->objid.ni)

	if (sbi->objid.ni) {

		iput(&sbi->objid.ni->vfs_inode);

		sbi->objid.ni = NULL;

	}



	if (sbi->volume.ni)

	if (sbi->volume.ni) {

		iput(&sbi->volume.ni->vfs_inode);

		sbi->volume.ni = NULL;

	}



	ntfs_update_mftmirr(sbi, 0);
@@ -1577,6 +1587,7 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc) 
	iput(inode);

out:

	kfree(boot2);

	ntfs3_put_sbi(sbi);

	return err;

}