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.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
include
/
linux
/
pagemap.h
diff --git
a/include/linux/pagemap.h
b/include/linux/pagemap.h
index
427b696
..
4da205f
100644
(file)
--- a/
include/linux/pagemap.h
+++ b/
include/linux/pagemap.h
@@
-8,6
+8,7
@@
#include <linux/fs.h>
#include <linux/list.h>
#include <linux/highmem.h>
#include <linux/fs.h>
#include <linux/list.h>
#include <linux/highmem.h>
+#include <linux/compiler.h>
#include <asm/uaccess.h>
#include <linux/gfp.h>
#include <asm/uaccess.h>
#include <linux/gfp.h>
@@
-136,7
+137,10
@@
static inline void pagecache_acct(int count)
static inline unsigned long get_page_cache_size(void)
{
static inline unsigned long get_page_cache_size(void)
{
- return atomic_read(&nr_pagecache);
+ int ret = atomic_read(&nr_pagecache);
+ if (unlikely(ret < 0))
+ ret = 0;
+ return ret;
}
static inline pgoff_t linear_page_index(struct vm_area_struct *vma,
}
static inline pgoff_t linear_page_index(struct vm_area_struct *vma,