mirror of
https://github.com/tbsdtv/linux_media.git
synced 2025-07-23 04:33:26 +02:00
fs: remove get_super_thawed and get_super_exclusive_thawed
Just open code the wait in the only caller of both functions. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Jan Kara <jack@suse.cz> Reviewed-by: Hannes Reinecke <hare@suse.de> Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
committed by
Jens Axboe
parent
5df1a67269
commit
60b498852b
51
fs/super.c
51
fs/super.c
@@ -307,7 +307,7 @@ static void __put_super(struct super_block *s)
|
||||
* Drops a temporary reference, frees superblock if there's no
|
||||
* references left.
|
||||
*/
|
||||
static void put_super(struct super_block *sb)
|
||||
void put_super(struct super_block *sb)
|
||||
{
|
||||
spin_lock(&sb_lock);
|
||||
__put_super(sb);
|
||||
@@ -740,7 +740,7 @@ void iterate_supers_type(struct file_system_type *type,
|
||||
|
||||
EXPORT_SYMBOL(iterate_supers_type);
|
||||
|
||||
static struct super_block *__get_super(struct block_device *bdev, bool excl)
|
||||
struct super_block *__get_super(struct block_device *bdev, bool excl)
|
||||
{
|
||||
struct super_block *sb;
|
||||
|
||||
@@ -789,53 +789,6 @@ struct super_block *get_super(struct block_device *bdev)
|
||||
}
|
||||
EXPORT_SYMBOL(get_super);
|
||||
|
||||
static struct super_block *__get_super_thawed(struct block_device *bdev,
|
||||
bool excl)
|
||||
{
|
||||
while (1) {
|
||||
struct super_block *s = __get_super(bdev, excl);
|
||||
if (!s || s->s_writers.frozen == SB_UNFROZEN)
|
||||
return s;
|
||||
if (!excl)
|
||||
up_read(&s->s_umount);
|
||||
else
|
||||
up_write(&s->s_umount);
|
||||
wait_event(s->s_writers.wait_unfrozen,
|
||||
s->s_writers.frozen == SB_UNFROZEN);
|
||||
put_super(s);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* get_super_thawed - get thawed superblock of a device
|
||||
* @bdev: device to get the superblock for
|
||||
*
|
||||
* Scans the superblock list and finds the superblock of the file system
|
||||
* mounted on the device. The superblock is returned once it is thawed
|
||||
* (or immediately if it was not frozen). %NULL is returned if no match
|
||||
* is found.
|
||||
*/
|
||||
struct super_block *get_super_thawed(struct block_device *bdev)
|
||||
{
|
||||
return __get_super_thawed(bdev, false);
|
||||
}
|
||||
EXPORT_SYMBOL(get_super_thawed);
|
||||
|
||||
/**
|
||||
* get_super_exclusive_thawed - get thawed superblock of a device
|
||||
* @bdev: device to get the superblock for
|
||||
*
|
||||
* Scans the superblock list and finds the superblock of the file system
|
||||
* mounted on the device. The superblock is returned once it is thawed
|
||||
* (or immediately if it was not frozen) and s_umount semaphore is held
|
||||
* in exclusive mode. %NULL is returned if no match is found.
|
||||
*/
|
||||
struct super_block *get_super_exclusive_thawed(struct block_device *bdev)
|
||||
{
|
||||
return __get_super_thawed(bdev, true);
|
||||
}
|
||||
EXPORT_SYMBOL(get_super_exclusive_thawed);
|
||||
|
||||
/**
|
||||
* get_active_super - get an active reference to the superblock of a device
|
||||
* @bdev: device to get the superblock for
|
||||
|
Reference in New Issue
Block a user