a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'xfs-misc-fixes-for-4.4-3' into for-next

Browse Source
This commit is contained in:
Dave Chinner 2015-11-10 10:20:48 +11:00
commit 4e14e49a91
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fs/xfs/xfs_acl.c
View File

@ -163,6 +163,7 @@ xfs_get_acl(struct inode *inode, int type)
*/ */
if (error == -ENOATTR) if (error == -ENOATTR)
goto out_update_cache; goto out_update_cache;
acl = ERR_PTR(error);
goto out; goto out;
} }

1
fs/xfs/xfs_acl.h
View File

@ -20,7 +20,6 @@
struct inode; struct inode;
struct posix_acl; struct posix_acl;
struct xfs_inode;
#ifdef CONFIG_XFS_POSIX_ACL #ifdef CONFIG_XFS_POSIX_ACL
extern struct posix_acl *xfs_get_acl(struct inode *inode, int type); extern struct posix_acl *xfs_get_acl(struct inode *inode, int type);

2
fs/xfs/xfs_log_recover.c
View File

@ -3431,7 +3431,7 @@ xlog_recover_add_to_cont_trans(
* previous record. Copy the rest of the header. * previous record. Copy the rest of the header.
*/ */
if (list_empty(&trans->r_itemq)) { 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)) { if (len > sizeof(struct xfs_trans_header)) {
xfs_warn(log->l_mp, "%s: bad header length", __func__); xfs_warn(log->l_mp, "%s: bad header length", __func__);
return -EIO; return -EIO;

7
fs/xfs/xfs_super.c
View File

@ -838,17 +838,18 @@ xfs_init_mount_workqueues(
goto out_destroy_unwritten; goto out_destroy_unwritten;
mp->m_reclaim_workqueue = alloc_workqueue("xfs-reclaim/%s", 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) if (!mp->m_reclaim_workqueue)
goto out_destroy_cil; goto out_destroy_cil;
mp->m_log_workqueue = alloc_workqueue("xfs-log/%s", 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) if (!mp->m_log_workqueue)
goto out_destroy_reclaim; goto out_destroy_reclaim;
mp->m_eofblocks_workqueue = alloc_workqueue("xfs-eofblocks/%s", 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) if (!mp->m_eofblocks_workqueue)
goto out_destroy_log; goto out_destroy_log;