diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-11 01:19:26 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-11 01:19:26 (GMT) |
| commit | fbc1487019d287bd869baac846dee97f39f8f07c (patch) | |
| tree | b44f6573874fa2dc0fa8f9466380f530142b9bd7 /fs/xfs/linux-2.6/xfs_ioctl.c | |
| parent | 5ee5e97ee9bca919af11c562beeaf61741ad33f1 (diff) | |
| parent | 51749e47e191db8e588ad5cebea731caf7b705d7 (diff) | |
| download | linux-fsl-qoriq-fbc1487019d287bd869baac846dee97f39f8f07c.tar.xz | |
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
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_ioctl.c')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_ioctl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/xfs/linux-2.6/xfs_ioctl.c b/fs/xfs/linux-2.6/xfs_ioctl.c index 4fec427..3b9e626 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; |