diff options
| author | Bob Peterson <rpeterso@redhat.com> | 2021-03-25 08:51:13 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-04-16 11:49:30 +0200 |
| commit | 9e5e04436285cba9d903ab3d1beeb5da2084065a (patch) | |
| tree | ad22b38c00dfc5db91bf0d2e7533d160e76a1358 | |
| parent | cc724288872a31563ef2f4edf73b8e7e3d502d95 (diff) | |
| download | linux-stable-9e5e04436285cba9d903ab3d1beeb5da2084065a.tar.gz linux-stable-9e5e04436285cba9d903ab3d1beeb5da2084065a.tar.bz2 linux-stable-9e5e04436285cba9d903ab3d1beeb5da2084065a.zip | |
gfs2: report "already frozen/thawed" errors
[ Upstream commit ff132c5f93c06bd4432bbab5c369e468653bdec4 ]
Before this patch, gfs2's freeze function failed to report an error
when the target file system was already frozen as it should (and as
generic vfs function freeze_super does. Similarly, gfs2's thaw function
failed to report an error when trying to thaw a file system that is not
frozen, as vfs function thaw_super does. The errors were checked, but
it always returned a 0 return code.
This patch adds the missing error return codes to gfs2 freeze and thaw.
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | fs/gfs2/super.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c index 22cd68bd8c9b..3cc2237e5896 100644 --- a/fs/gfs2/super.c +++ b/fs/gfs2/super.c @@ -1000,11 +1000,13 @@ void gfs2_freeze_func(struct work_struct *work) static int gfs2_freeze(struct super_block *sb) { struct gfs2_sbd *sdp = sb->s_fs_info; - int error = 0; + int error; mutex_lock(&sdp->sd_freeze_mutex); - if (atomic_read(&sdp->sd_freeze_state) != SFS_UNFROZEN) + if (atomic_read(&sdp->sd_freeze_state) != SFS_UNFROZEN) { + error = -EBUSY; goto out; + } if (test_bit(SDF_SHUTDOWN, &sdp->sd_flags)) { error = -EINVAL; @@ -1046,10 +1048,10 @@ static int gfs2_unfreeze(struct super_block *sb) struct gfs2_sbd *sdp = sb->s_fs_info; mutex_lock(&sdp->sd_freeze_mutex); - if (atomic_read(&sdp->sd_freeze_state) != SFS_FROZEN || + if (atomic_read(&sdp->sd_freeze_state) != SFS_FROZEN || !gfs2_holder_initialized(&sdp->sd_freeze_gh)) { mutex_unlock(&sdp->sd_freeze_mutex); - return 0; + return -EINVAL; } gfs2_glock_dq_uninit(&sdp->sd_freeze_gh); |