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

+4 -1
+2 -1
fs/xfs/linux-2.6/xfs_buf.c
··· 1932 1932 if (!xfs_buf_zone) 1933 1933 goto out; 1934 1934 1935 - xfslogd_workqueue = create_workqueue("xfslogd"); 1935 + xfslogd_workqueue = alloc_workqueue("xfslogd", 1936 + WQ_RESCUER | WQ_HIGHPRI, 1); 1936 1937 if (!xfslogd_workqueue) 1937 1938 goto out_free_buf_zone; 1938 1939
+2
fs/xfs/linux-2.6/xfs_ioctl.c
··· 785 785 { 786 786 struct fsxattr fa; 787 787 788 + memset(&fa, 0, sizeof(struct fsxattr)); 789 + 788 790 xfs_ilock(ip, XFS_ILOCK_SHARED); 789 791 fa.fsx_xflags = xfs_ip2xflags(ip); 790 792 fa.fsx_extsize = ip->i_d.di_extsize << ip->i_mount->m_sb.sb_blocklog;