Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b71e8a4c authored by David Howells's avatar David Howells Committed by Jens Axboe
Browse files

[PATCH] BLOCK: Move __invalidate_device() to block_dev.c [try #6] 



Move __invalidate_device() from fs/inode.c to fs/block_dev.c so that it can
more easily be disabled when the block layer is disabled.

Signed-Off-By: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 811d736f

fs/block_dev.c

+21 −0
Original line number Original line Diff line number Diff line
@@ -1315,3 +1315,24 @@ void close_bdev_excl(struct block_device *bdev) 
}

}





EXPORT_SYMBOL(close_bdev_excl);

EXPORT_SYMBOL(close_bdev_excl);



int __invalidate_device(struct block_device *bdev)

{

	struct super_block *sb = get_super(bdev);

	int res = 0;



	if (sb) {

		/*

		 * no need to lock the super, get_super holds the

		 * read mutex so the filesystem cannot go away

		 * under us (->put_super runs with the write lock

		 * hold).

		 */

		shrink_dcache_sb(sb);

		res = invalidate_inodes(sb);

		drop_super(sb);

	}

	invalidate_bdev(bdev, 0);

	return res;

}

EXPORT_SYMBOL(__invalidate_device);

fs/inode.c

+0 −21
Original line number Original line Diff line number Diff line
@@ -363,27 +363,6 @@ int invalidate_inodes(struct super_block * sb) 




EXPORT_SYMBOL(invalidate_inodes);

EXPORT_SYMBOL(invalidate_inodes);





int __invalidate_device(struct block_device *bdev)

{

	struct super_block *sb = get_super(bdev);

	int res = 0;



	if (sb) {

		/*

		 * no need to lock the super, get_super holds the

		 * read mutex so the filesystem cannot go away

		 * under us (->put_super runs with the write lock

		 * hold).

		 */

		shrink_dcache_sb(sb);

		res = invalidate_inodes(sb);

		drop_super(sb);

	}

	invalidate_bdev(bdev, 0);

	return res;

}

EXPORT_SYMBOL(__invalidate_device);



static int can_unuse(struct inode *inode)

static int can_unuse(struct inode *inode)

{

{

	if (inode->i_state)

	if (inode->i_state)