Commit fbc14870 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: log IO completion workqueue is a high priority queue
  xfs: prevent reading uninitialized stack memory
parents 5ee5e97e 51749e47
...@@ -1932,7 +1932,8 @@ xfs_buf_init(void) ...@@ -1932,7 +1932,8 @@ xfs_buf_init(void)
if (!xfs_buf_zone) if (!xfs_buf_zone)
goto out; goto out;
xfslogd_workqueue = create_workqueue("xfslogd"); xfslogd_workqueue = alloc_workqueue("xfslogd",
WQ_RESCUER | WQ_HIGHPRI, 1);
if (!xfslogd_workqueue) if (!xfslogd_workqueue)
goto out_free_buf_zone; goto out_free_buf_zone;
......
...@@ -785,6 +785,8 @@ xfs_ioc_fsgetxattr( ...@@ -785,6 +785,8 @@ xfs_ioc_fsgetxattr(
{ {
struct fsxattr fa; struct fsxattr fa;
memset(&fa, 0, sizeof(struct fsxattr));
xfs_ilock(ip, XFS_ILOCK_SHARED); xfs_ilock(ip, XFS_ILOCK_SHARED);
fa.fsx_xflags = xfs_ip2xflags(ip); fa.fsx_xflags = xfs_ip2xflags(ip);
fa.fsx_extsize = ip->i_d.di_extsize << ip->i_mount->m_sb.sb_blocklog; fa.fsx_extsize = ip->i_d.di_extsize << ip->i_mount->m_sb.sb_blocklog;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment