Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbc14870 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

fs/xfs/linux-2.6/xfs_buf.c

+2 −1
Original line number Diff line number Diff line
@@ -1932,7 +1932,8 @@ xfs_buf_init(void) 
	if (!xfs_buf_zone)

		goto out;



	xfslogd_workqueue = create_workqueue("xfslogd");

	xfslogd_workqueue = alloc_workqueue("xfslogd",

					WQ_RESCUER | WQ_HIGHPRI, 1);

	if (!xfslogd_workqueue)

		goto out_free_buf_zone;

fs/xfs/linux-2.6/xfs_ioctl.c

+2 −0
Original line number Diff line number Diff line
@@ -785,6 +785,8 @@ xfs_ioc_fsgetxattr( 
{

	struct fsxattr		fa;



	memset(&fa, 0, sizeof(struct fsxattr));



	xfs_ilock(ip, XFS_ILOCK_SHARED);

	fa.fsx_xflags = xfs_ip2xflags(ip);

	fa.fsx_extsize = ip->i_d.di_extsize << ip->i_mount->m_sb.sb_blocklog;