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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
fs
/
ncpfs
/
mmap.c
diff --git
a/fs/ncpfs/mmap.c
b/fs/ncpfs/mmap.c
index
52d60c3
..
70a6911
100644
(file)
--- a/
fs/ncpfs/mmap.c
+++ b/
fs/ncpfs/mmap.c
@@
-29,7
+29,7
@@
static struct page* ncp_file_mmap_nopage(struct vm_area_struct *area,
unsigned long address, int *type)
{
struct file *file = area->vm_file;
unsigned long address, int *type)
{
struct file *file = area->vm_file;
- struct dentry *dentry = file->f_dentry;
+ struct dentry *dentry = file->f_
path.
dentry;
struct inode *inode = dentry->d_inode;
struct page* page;
char *pg_addr;
struct inode *inode = dentry->d_inode;
struct page* page;
char *pg_addr;
@@
-93,7
+93,7
@@
static struct page* ncp_file_mmap_nopage(struct vm_area_struct *area,
*/
if (type)
*type = VM_FAULT_MAJOR;
*/
if (type)
*type = VM_FAULT_MAJOR;
-
inc_page_state(pgmajfault
);
+
count_vm_event(PGMAJFAULT
);
return page;
}
return page;
}
@@
-106,7
+106,7
@@
static struct vm_operations_struct ncp_file_mmap =
/* This is used for a general mmap of a ncp file */
int ncp_mmap(struct file *file, struct vm_area_struct *vma)
{
/* This is used for a general mmap of a ncp file */
int ncp_mmap(struct file *file, struct vm_area_struct *vma)
{
- struct inode *inode = file->f_dentry->d_inode;
+ struct inode *inode = file->f_
path.
dentry->d_inode;
DPRINTK("ncp_mmap: called\n");
DPRINTK("ncp_mmap: called\n");