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
vserver 1.9.5.x5
[linux-2.6.git]
/
include
/
linux
/
vs_dlimit.h
diff --git
a/include/linux/vs_dlimit.h
b/include/linux/vs_dlimit.h
index
53400ab
..
b927687
100644
(file)
--- a/
include/linux/vs_dlimit.h
+++ b/
include/linux/vs_dlimit.h
@@
-1,11
+1,7
@@
#ifndef _VX_VS_DLIMIT_H
#define _VX_VS_DLIMIT_H
#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"
#include "vserver/dlimit.h"
#include "vserver/debug.h"
@@
-25,7
+21,7
@@
static inline struct dl_info *__get_dl_info(struct dl_info *dli,
}
}
-#define
free_dl_info(i) \
+#define free_dl_info(i) \
call_rcu(&i->dl_rcu, rcu_free_dl_info);
#define put_dl_info(i) __put_dl_info(i,__FILE__,__LINE__)
call_rcu(&i->dl_rcu, rcu_free_dl_info);
#define put_dl_info(i) __put_dl_info(i,__FILE__,__LINE__)
@@
-43,7
+39,7
@@
static inline void __put_dl_info(struct dl_info *dli,
}
}
-#define
__dlimit_char(d)
((d)?'*':' ')
+#define
__dlimit_char(d)
((d)?'*':' ')
static inline int __dl_alloc_space(struct super_block *sb,
xid_t xid, dlsize_t nr, const char *file, int line)
static inline int __dl_alloc_space(struct super_block *sb,
xid_t xid, dlsize_t nr, const char *file, int line)
@@
-66,7
+62,8
@@
static inline int __dl_alloc_space(struct super_block *sb,
out:
vxlprintk(VXD_CBIT(dlim, 1),
"ALLOC (%p,#%d)%c %lld bytes (%d)",
out:
vxlprintk(VXD_CBIT(dlim, 1),
"ALLOC (%p,#%d)%c %lld bytes (%d)",
- sb, xid, __dlimit_char(dli), nr, ret, file, line);
+ sb, xid, __dlimit_char(dli), (long long)nr,
+ ret, file, line);
return ret;
}
return ret;
}
@@
-91,7
+88,8
@@
static inline void __dl_free_space(struct super_block *sb,
out:
vxlprintk(VXD_CBIT(dlim, 1),
"FREE (%p,#%d)%c %lld bytes",
out:
vxlprintk(VXD_CBIT(dlim, 1),
"FREE (%p,#%d)%c %lld bytes",
- sb, xid, __dlimit_char(dli), nr, _file, _line);
+ sb, xid, __dlimit_char(dli), (long long)nr,
+ _file, _line);
}
static inline int __dl_alloc_inode(struct super_block *sb,
}
static inline int __dl_alloc_inode(struct super_block *sb,
@@
-110,7
+108,7
@@
static inline int __dl_alloc_inode(struct super_block *sb,
dli->dl_inodes_used++;
#if 0
else
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);
sb, xid,
dli->dl_inodes_used, dli->dl_inodes_total,
file, line);
@@
-167,8
+165,9
@@
static inline void __dl_adjust_block(struct super_block *sb, xid_t xid,
vxlprintk(VXD_CBIT(dlim, 2),
"ADJUST: %lld,%lld on %d,%d [mult=%d]",
vxlprintk(VXD_CBIT(dlim, 2),
"ADJUST: %lld,%lld on %d,%d [mult=%d]",
- bfree, broot, *free_blocks, *root_blocks,
- dli->dl_nrlmult, _file, _line);
+ (long long)bfree, (long long)broot,
+ *free_blocks, *root_blocks, dli->dl_nrlmult,
+ _file, _line);
if (free_blocks) {
if (*free_blocks > bfree)
*free_blocks = bfree;
if (free_blocks) {
if (*free_blocks > bfree)
*free_blocks = bfree;
@@
-198,7
+197,7
@@
static inline void __dl_adjust_block(struct super_block *sb, xid_t xid,
__dl_free_inode(sb, xid, __FILE__, __LINE__ )
__dl_free_inode(sb, xid, __FILE__, __LINE__ )
-#define
DLIMIT_ADJUST_BLOCK(sb, xid, fb, rb) \
+#define DLIMIT_ADJUST_BLOCK(sb, xid, fb, rb) \
__dl_adjust_block(sb, xid, fb, rb, __FILE__, __LINE__ )
__dl_adjust_block(sb, xid, fb, rb, __FILE__, __LINE__ )