diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-12 17:31:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-12 17:31:16 -0700 |
| commit | af84b99f22df115e7aec41d5dbe936e163ef4e2e (patch) | |
| tree | 7f0b0ef4ee3a3985281cd50d3f629dc582f3db9f /fs/xfs/quota/xfs_qm_bhv.c | |
| parent | Merge branch 'audit.b28' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current (diff) | |
| parent | [XFS] Fix a bad pointer dereference in the quota statvfs handling. (diff) | |
| download | linux-dev-af84b99f22df115e7aec41d5dbe936e163ef4e2e.tar.xz linux-dev-af84b99f22df115e7aec41d5dbe936e163ef4e2e.zip | |
Merge git://oss.sgi.com:8090/xfs/xfs-2.6
* git://oss.sgi.com:8090/xfs/xfs-2.6:
[XFS] Fix a bad pointer dereference in the quota statvfs handling.
[XFS] Fix xfs_splice_write() so appended data gets to disk.
[XFS] Fix ABBA deadlock between i_mutex and iolock. Avoid calling
[XFS] Prevent free space oversubscription and xfssyncd looping.
Diffstat (limited to 'fs/xfs/quota/xfs_qm_bhv.c')
| -rw-r--r-- | fs/xfs/quota/xfs_qm_bhv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/quota/xfs_qm_bhv.c b/fs/xfs/quota/xfs_qm_bhv.c index f137856c3261..db8872be8c87 100644 --- a/fs/xfs/quota/xfs_qm_bhv.c +++ b/fs/xfs/quota/xfs_qm_bhv.c @@ -203,7 +203,7 @@ xfs_qm_statvfs( if (error || !vnode) return error; - mp = XFS_BHVTOM(bhv); + mp = xfs_vfstom(bhvtovfs(bhv)); ip = xfs_vtoi(vnode); if (!(ip->i_d.di_flags & XFS_DIFLAG_PROJINHERIT)) |