Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / include / linux / vs_dlimit.h

diff --git a/include/linux/vs_dlimit.h b/include/linux/vs_dlimit.h
index 805c257..674262d 100644 (file)
--- a/include/linux/vs_dlimit.h
+++ b/include/linux/vs_dlimit.h
@@ -1,11 +1,6 @@
 #ifndef _VX_VS_DLIMIT_H
 #define _VX_VS_DLIMIT_H
 
-#include <linux/kernel.h>
-#include <linux/rcupdate.h>
-#include <linux/sched.h>
-
-#include "vserver/context.h"
 #include "vserver/dlimit.h"
 #include "vserver/debug.h"
 
@@ -112,7 +107,7 @@ static inline int __dl_alloc_inode(struct super_block *sb,
                dli->dl_inodes_used++;
 #if 0
        else
-               printk("VSW: DLIMIT hit (%p,#%d), inode %d>=%d @ %s:%d\n",
+               vxwprintk("DLIMIT hit (%p,#%d), inode %d>=%d @ %s:%d",
                        sb, xid,
                        dli->dl_inodes_used, dli->dl_inodes_total,
                        file, line);
@@ -183,22 +178,30 @@ static inline void __dl_adjust_block(struct super_block *sb, xid_t xid,
        put_dl_info(dli);
 }
 
+#define DLIMIT_ALLOC_SPACE(in, bytes) \
+       __dl_alloc_space((in)->i_sb, (in)->i_xid, (dlsize_t)(bytes), \
+               __FILE__, __LINE__ )
 
-#define DLIMIT_ALLOC_BLOCK(sb, xid, nr) \
-       __dl_alloc_space(sb, xid, \
-               ((dlsize_t)(nr)) << (sb)->s_blocksize_bits, \
+#define DLIMIT_FREE_SPACE(in, bytes) \
+       __dl_free_space((in)->i_sb, (in)->i_xid, (dlsize_t)(bytes), \
                __FILE__, __LINE__ )
 
-#define DLIMIT_FREE_BLOCK(sb, xid, nr) \
-       __dl_free_space(sb, xid, \
-               ((dlsize_t)(nr)) << (sb)->s_blocksize_bits, \
+#define DLIMIT_ALLOC_BLOCK(in, nr) \
+       __dl_alloc_space((in)->i_sb, (in)->i_xid, \
+               ((dlsize_t)(nr)) << (in)->i_sb->s_blocksize_bits, \
                __FILE__, __LINE__ )
 
-#define DLIMIT_ALLOC_INODE(sb, xid) \
-       __dl_alloc_inode(sb, xid, __FILE__, __LINE__ )
+#define DLIMIT_FREE_BLOCK(in, nr) \
+       __dl_free_space((in)->i_sb, (in)->i_xid, \
+               ((dlsize_t)(nr)) << (in)->i_sb->s_blocksize_bits, \
+               __FILE__, __LINE__ )
+
+
+#define DLIMIT_ALLOC_INODE(in) \
+       __dl_alloc_inode((in)->i_sb, (in)->i_xid, __FILE__, __LINE__ )
 
-#define DLIMIT_FREE_INODE(sb, xid) \
-       __dl_free_inode(sb, xid, __FILE__, __LINE__ )
+#define DLIMIT_FREE_INODE(in) \
+       __dl_free_inode((in)->i_sb, (in)->i_xid, __FILE__, __LINE__ )
 
 
 #define DLIMIT_ADJUST_BLOCK(sb, xid, fb, rb) \