Merge branch 'for-3.19' of git://linux-nfs.org/~bfields/linux

[cascardo/linux.git] / fs / ioctl.c

diff --git a/fs/ioctl.c b/fs/ioctl.c
index 0bd6142..214c3c1 100644 (file)
--- 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);
 }