kevin/linux
1
Fork 0
Code

fs: remove unused helper

Browse Source 
The grab_super() helper is now only used by grab_super_dead(). Merge the
two helpers into one.

Link: https://lore.kernel.org/r/20231024-vfs-super-freeze-v2-8-599c19f4faac@kernel.org
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
Christian Brauner 2023-10-24 15:01:14 +02:00
parent 90f95dc415
commit 97cbed04e7
No known key found for this signature in database
GPG Key ID: 91C61BC06578DCA2
1 changed files with 14 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
fs/super.c
View File

@ -523,37 +523,6 @@ void deactivate_super(struct super_block *s)
EXPORT_SYMBOL(deactivate_super); EXPORT_SYMBOL(deactivate_super);
/**
* grab_super - acquire an active reference
* @s: reference we are trying to make active
*
* Tries to acquire an active reference. grab_super() is used when we
* had just found a superblock in super_blocks or fs_type->fs_supers
* and want to turn it into a full-blown active reference. grab_super()
* is called with sb_lock held and drops it. Returns 1 in case of
* success, 0 if we had failed (superblock contents was already dead or
* dying when grab_super() had been called). Note that this is only
* called for superblocks not in rundown mode (== ones still on ->fs_supers
* of their type), so increment of ->s_count is OK here.
*/
static int grab_super(struct super_block *s) __releases(sb_lock)
{
bool locked;
s->s_count++;
spin_unlock(&sb_lock);
locked = super_lock_excl(s);
if (locked) {
if (atomic_inc_not_zero(&s->s_active)) {
put_super(s);
return 1;
}
super_unlock_excl(s);
}
put_super(s);
return 0;
}
static inline bool wait_dead(struct super_block *sb) static inline bool wait_dead(struct super_block *sb)
{ {
unsigned int flags; unsigned int flags;
@ -567,7 +536,7 @@ static inline bool wait_dead(struct super_block *sb)
} }
/** /**
* grab_super_dead - acquire an active reference to a superblock * grab_super - acquire an active reference to a superblock
* @sb: superblock to acquire * @sb: superblock to acquire
* *
* Acquire a temporary reference on a superblock and try to trade it for * Acquire a temporary reference on a superblock and try to trade it for
@ -578,16 +547,21 @@ static inline bool wait_dead(struct super_block *sb)
* Return: This returns true if an active reference could be acquired, * Return: This returns true if an active reference could be acquired,
* false if not. * false if not.
*/ */
static bool grab_super_dead(struct super_block *sb) static bool grab_super(struct super_block *sb)
{ {
bool locked;
sb->s_count++; sb->s_count++;
if (grab_super(sb)) { spin_unlock(&sb_lock);
put_super(sb); locked = super_lock_excl(sb);
lockdep_assert_held(&sb->s_umount); if (locked) {
return true; if (atomic_inc_not_zero(&sb->s_active)) {
put_super(sb);
return true;
}
super_unlock_excl(sb);
} }
wait_var_event(&sb->s_flags, wait_dead(sb)); wait_var_event(&sb->s_flags, wait_dead(sb));
lockdep_assert_not_held(&sb->s_umount);
put_super(sb); put_super(sb);
return false; return false;
} }
@ -838,7 +812,7 @@ share_extant_sb:
warnfc(fc, "reusing existing filesystem in another namespace not allowed"); warnfc(fc, "reusing existing filesystem in another namespace not allowed");
return ERR_PTR(-EBUSY); return ERR_PTR(-EBUSY);
} }
if (!grab_super_dead(old)) if (!grab_super(old))
goto retry; goto retry;
destroy_unused_super(s); destroy_unused_super(s);
return old; return old;
@ -882,7 +856,7 @@ retry:
destroy_unused_super(s); destroy_unused_super(s);
return ERR_PTR(-EBUSY); return ERR_PTR(-EBUSY);
} }
if (!grab_super_dead(old)) if (!grab_super(old))
goto retry; goto retry;
destroy_unused_super(s); destroy_unused_super(s);
return old; return old;