1 files changed, 9 insertions, 5 deletions

diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c
index 455e2b2fb964..f6dd7de25927 100644
--- a/fs/xfs/linux-2.6/xfs_super.c
+++ b/fs/xfs/linux-2.6/xfs_super.c
@@ -483,7 +483,7 @@ xfssyncd(
                 set_current_state(TASK_INTERRUPTIBLE);
                 timeleft = schedule_timeout(timeleft);
                 /* swsusp */
-                try_to_freeze(PF_FREEZE);
+                try_to_freeze();
                 if (vfsp->vfs_flag & VFS_UMOUNT)
                         break;
 
@@ -590,8 +590,10 @@ linvfs_sync_super(
         int             error;
         int             flags = SYNC_FSDATA;
 
-        if (wait)
-                flags |= SYNC_WAIT;
+        if (unlikely(sb->s_frozen == SB_FREEZE_WRITE))
+                flags = SYNC_QUIESCE;
+        else
+                flags = SYNC_FSDATA | (wait ? SYNC_WAIT : 0);
 
         VFS_SYNC(vfsp, flags, NULL, error);
         sb->s_dirt = 0;
@@ -701,7 +703,8 @@ linvfs_getxquota(
         struct vfs              *vfsp = LINVFS_GET_VFS(sb);
         int                     error, getmode;
 
-        getmode = (type == GRPQUOTA) ? Q_XGETGQUOTA : Q_XGETQUOTA;
+        getmode = (type == USRQUOTA) ? Q_XGETQUOTA :
+                 ((type == GRPQUOTA) ? Q_XGETGQUOTA : Q_XGETPQUOTA);
         VFS_QUOTACTL(vfsp, getmode, id, (caddr_t)fdq, error);
         return -error;
 }
@@ -716,7 +719,8 @@ linvfs_setxquota(
         struct vfs              *vfsp = LINVFS_GET_VFS(sb);
         int                     error, setmode;
 
-        setmode = (type == GRPQUOTA) ? Q_XSETGQLIM : Q_XSETQLIM;
+        setmode = (type == USRQUOTA) ? Q_XSETQLIM :
+                 ((type == GRPQUOTA) ? Q_XSETGQLIM : Q_XSETPQLIM);
         VFS_QUOTACTL(vfsp, setmode, id, (caddr_t)fdq, error);
         return -error;
 }