diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-10 18:19:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-10 18:19:26 -0700 |
| commit | fbc1487019d287bd869baac846dee97f39f8f07c (patch) | |
| tree | b44f6573874fa2dc0fa8f9466380f530142b9bd7 | |
| parent | 5ee5e97ee9bca919af11c562beeaf61741ad33f1 (diff) | |
| parent | 51749e47e191db8e588ad5cebea731caf7b705d7 (diff) | |
| download | linux-fbc1487019d287bd869baac846dee97f39f8f07c.tar.bz2 | |
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
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_buf.c | 3 | ||||
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_ioctl.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/fs/xfs/linux-2.6/xfs_buf.c b/fs/xfs/linux-2.6/xfs_buf.c index d72cf2bb054a..286e36e21dae 100644 --- a/fs/xfs/linux-2.6/xfs_buf.c +++ b/fs/xfs/linux-2.6/xfs_buf.c @@ -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; diff --git a/fs/xfs/linux-2.6/xfs_ioctl.c b/fs/xfs/linux-2.6/xfs_ioctl.c index 4fec427b83ef..3b9e626f7cd1 100644 --- a/fs/xfs/linux-2.6/xfs_ioctl.c +++ b/fs/xfs/linux-2.6/xfs_ioctl.c @@ -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; |