Merge branch 'xfs-misc-fixes-for-3.19-1' into for-next

1 files changed, 2 insertions, 1 deletions

diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h
index b0447c86e7e2..01fb28f5ae1c 100644
--- a/fs/xfs/xfs_mount.h
+++ b/fs/xfs/xfs_mount.h
@@ -168,6 +168,7 @@ typedef struct xfs_mount {
                                                 /* low free space thresholds */
         struct xfs_kobj         m_kobj;
 
+        struct workqueue_struct *m_buf_workqueue;
         struct workqueue_struct *m_data_workqueue;
         struct workqueue_struct *m_unwritten_workqueue;
         struct workqueue_struct *m_cil_workqueue;
@@ -384,7 +385,7 @@ extern int	xfs_mount_log_sb(xfs_mount_t *, __int64_t);
 extern struct xfs_buf *xfs_getsb(xfs_mount_t *, int);
 extern int      xfs_readsb(xfs_mount_t *, int);
 extern void     xfs_freesb(xfs_mount_t *);
-extern int      xfs_fs_writable(xfs_mount_t *);
+extern bool     xfs_fs_writable(struct xfs_mount *mp, int level);
 extern int      xfs_sb_validate_fsb_count(struct xfs_sb *, __uint64_t);
 
 extern int      xfs_dev_is_read_only(struct xfs_mount *, char *);