summaryrefslogtreecommitdiff
path: root/fs/super.c
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2016-10-29 13:26:04 +0800
committerAlex Shi <alex.shi@linaro.org>2016-10-29 13:26:04 +0800
commitc11a255c622e7a2d312f4080c6ef529dd67b3c38 (patch)
treec7d36f8014e9da35e4b772cfdc1779ec0449d657 /fs/super.c
parent273daee0be36235886622396eedb618fc5de0213 (diff)
parent25f89e269f5c5d06594098cc3b1d97554249f3f9 (diff)
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'fs/super.c')
-rw-r--r--fs/super.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/super.c b/fs/super.c
index 8d99a7b948ff..b938b14f6041 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -1326,8 +1326,8 @@ int freeze_super(struct super_block *sb)
}
}
/*
- * This is just for debugging purposes so that fs can warn if it
- * sees write activity when frozen is set to SB_FREEZE_COMPLETE.
+ * For debugging purposes so that fs can warn if it sees write activity
+ * when frozen is set to SB_FREEZE_COMPLETE, and for thaw_super().
*/
sb->s_writers.frozen = SB_FREEZE_COMPLETE;
up_write(&sb->s_umount);
@@ -1346,7 +1346,7 @@ int thaw_super(struct super_block *sb)
int error;
down_write(&sb->s_umount);
- if (sb->s_writers.frozen == SB_UNFROZEN) {
+ if (sb->s_writers.frozen != SB_FREEZE_COMPLETE) {
up_write(&sb->s_umount);
return -EINVAL;
}