2 files changed, 13 insertions, 3 deletions

diff --git a/fs/block_dev.c b/fs/block_dev.c
index 1d9c9f3754f8..b48c41bf0f86 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -235,7 +235,10 @@ struct super_block *freeze_bdev(struct block_device *bdev)
         sb = get_active_super(bdev);
         if (!sb)
                 goto out;
-        error = freeze_super(sb);
+        if (sb->s_op->freeze_super)
+                error = sb->s_op->freeze_super(sb);
+        else
+                error = freeze_super(sb);
         if (error) {
                 deactivate_super(sb);
                 bdev->bd_fsfreeze_count--;
@@ -272,7 +275,10 @@ int thaw_bdev(struct block_device *bdev, struct super_block *sb)
         if (!sb)
                 goto out;
 
-        error = thaw_super(sb);
+        if (sb->s_op->thaw_super)
+                error = sb->s_op->thaw_super(sb);
+        else
+                error = thaw_super(sb);
         if (error) {
                 bdev->bd_fsfreeze_count++;
                 mutex_unlock(&bdev->bd_fsfreeze_mutex);
diff --git a/fs/ioctl.c b/fs/ioctl.c
index 8ac3fad36192..77c9a7812542 100644
--- a/fs/ioctl.c
+++ b/fs/ioctl.c
@@ -518,10 +518,12 @@ static int ioctl_fsfreeze(struct file *filp)
                 return -EPERM;
 
         /* If filesystem doesn't support freeze feature, return. */
-        if (sb->s_op->freeze_fs == NULL)
+        if (sb->s_op->freeze_fs == NULL && sb->s_op->freeze_super == NULL)
                 return -EOPNOTSUPP;
 
         /* Freeze */
+        if (sb->s_op->freeze_super)
+                return sb->s_op->freeze_super(sb);
         return freeze_super(sb);
 }
 
@@ -533,6 +535,8 @@ static int ioctl_fsthaw(struct file *filp)
                 return -EPERM;
 
         /* Thaw */
+        if (sb->s_op->thaw_super)
+                return sb->s_op->thaw_super(sb);
         return thaw_super(sb);
 }