git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
fs
/
xfs
/
quota
/
xfs_qm_syscalls.c
diff --git
a/fs/xfs/quota/xfs_qm_syscalls.c
b/fs/xfs/quota/xfs_qm_syscalls.c
index
2d68f5c
..
87603ee
100644
(file)
--- a/
fs/xfs/quota/xfs_qm_syscalls.c
+++ b/
fs/xfs/quota/xfs_qm_syscalls.c
@@
-26,7
+26,6
@@
#include "xfs_trans.h"
#include "xfs_sb.h"
#include "xfs_ag.h"
#include "xfs_trans.h"
#include "xfs_sb.h"
#include "xfs_ag.h"
-#include "xfs_dir.h"
#include "xfs_dir2.h"
#include "xfs_alloc.h"
#include "xfs_dmapi.h"
#include "xfs_dir2.h"
#include "xfs_alloc.h"
#include "xfs_dmapi.h"
@@
-35,7
+34,6
@@
#include "xfs_bmap_btree.h"
#include "xfs_alloc_btree.h"
#include "xfs_ialloc_btree.h"
#include "xfs_bmap_btree.h"
#include "xfs_alloc_btree.h"
#include "xfs_ialloc_btree.h"
-#include "xfs_dir_sf.h"
#include "xfs_dir2_sf.h"
#include "xfs_attr_sf.h"
#include "xfs_dinode.h"
#include "xfs_dir2_sf.h"
#include "xfs_attr_sf.h"
#include "xfs_dinode.h"
@@
-91,8
+89,8
@@
xfs_qm_quotactl(
xfs_caddr_t addr)
{
xfs_mount_t *mp;
xfs_caddr_t addr)
{
xfs_mount_t *mp;
+ bhv_vfs_t *vfsp;
int error;
int error;
- struct vfs *vfsp;
vfsp = bhvtovfs(bdp);
mp = XFS_VFSTOM(vfsp);
vfsp = bhvtovfs(bdp);
mp = XFS_VFSTOM(vfsp);
@@
-1035,7
+1033,7
@@
xfs_qm_dqrele_all_inodes(
{
xfs_inode_t *ip, *topino;
uint ireclaims;
{
xfs_inode_t *ip, *topino;
uint ireclaims;
-
vnode_t
*vp;
+
bhv_vnode_t
*vp;
boolean_t vnode_refd;
ASSERT(mp->m_quotainfo);
boolean_t vnode_refd;
ASSERT(mp->m_quotainfo);