diff options
| author | Dave Chinner <david@fromorbit.com> | 2015-11-10 10:20:48 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-11-10 10:20:48 +1100 |
| commit | 4e14e49a91e18098fd8ef30743972e0c3cb727c1 (patch) | |
| tree | d9f6d8005ccd2a3ccbb13e80c639600b1e1bd6b4 /fs | |
| parent | 264e89ad3412ce1e2977e5e807bcf7d20d3b0a59 (diff) | |
| parent | 7a29ac474a47eb8cf212b45917683ae89d6fa13b (diff) | |
| download | op-kernel-dev-4e14e49a91e18098fd8ef30743972e0c3cb727c1.zip op-kernel-dev-4e14e49a91e18098fd8ef30743972e0c3cb727c1.tar.gz | |
Merge branch 'xfs-misc-fixes-for-4.4-3' into for-next
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/xfs/xfs_acl.c | 1 | ||||
| -rw-r--r-- | fs/xfs/xfs_acl.h | 1 | ||||
| -rw-r--r-- | fs/xfs/xfs_log_recover.c | 2 | ||||
| -rw-r--r-- | fs/xfs/xfs_super.c | 7 |
4 files changed, 6 insertions, 5 deletions
diff --git a/fs/xfs/xfs_acl.c b/fs/xfs/xfs_acl.c index 763e365..6bb470f 100644 --- a/fs/xfs/xfs_acl.c +++ b/fs/xfs/xfs_acl.c @@ -163,6 +163,7 @@ xfs_get_acl(struct inode *inode, int type) */ if (error == -ENOATTR) goto out_update_cache; + acl = ERR_PTR(error); goto out; } diff --git a/fs/xfs/xfs_acl.h b/fs/xfs/xfs_acl.h index 75af0a4..52f8255 100644 --- a/fs/xfs/xfs_acl.h +++ b/fs/xfs/xfs_acl.h @@ -20,7 +20,6 @@ struct inode; struct posix_acl; -struct xfs_inode; #ifdef CONFIG_XFS_POSIX_ACL extern struct posix_acl *xfs_get_acl(struct inode *inode, int type); diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c index f8f1363..c5ecaac 100644 --- a/fs/xfs/xfs_log_recover.c +++ b/fs/xfs/xfs_log_recover.c @@ -3431,7 +3431,7 @@ xlog_recover_add_to_cont_trans( * previous record. Copy the rest of the header. */ if (list_empty(&trans->r_itemq)) { - ASSERT(len < sizeof(struct xfs_trans_header)); + ASSERT(len <= sizeof(struct xfs_trans_header)); if (len > sizeof(struct xfs_trans_header)) { xfs_warn(log->l_mp, "%s: bad header length", __func__); return -EIO; diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index 0378e22e..36bd882 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c @@ -838,17 +838,18 @@ xfs_init_mount_workqueues( goto out_destroy_unwritten; mp->m_reclaim_workqueue = alloc_workqueue("xfs-reclaim/%s", - WQ_FREEZABLE, 0, mp->m_fsname); + WQ_MEM_RECLAIM|WQ_FREEZABLE, 0, mp->m_fsname); if (!mp->m_reclaim_workqueue) goto out_destroy_cil; mp->m_log_workqueue = alloc_workqueue("xfs-log/%s", - WQ_FREEZABLE|WQ_HIGHPRI, 0, mp->m_fsname); + WQ_MEM_RECLAIM|WQ_FREEZABLE|WQ_HIGHPRI, 0, + mp->m_fsname); if (!mp->m_log_workqueue) goto out_destroy_reclaim; mp->m_eofblocks_workqueue = alloc_workqueue("xfs-eofblocks/%s", - WQ_FREEZABLE, 0, mp->m_fsname); + WQ_MEM_RECLAIM|WQ_FREEZABLE, 0, mp->m_fsname); if (!mp->m_eofblocks_workqueue) goto out_destroy_log; |
