git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sched: remove the 'u64 now' parameter from ->dequeue_task()
[safe/jmp/linux-2.6]
/
include
/
linux
/
nfs_fs.h
diff --git
a/include/linux/nfs_fs.h
b/include/linux/nfs_fs.h
index
e9ae0c6
..
9ba4aec
100644
(file)
--- a/
include/linux/nfs_fs.h
+++ b/
include/linux/nfs_fs.h
@@
-30,7
+30,9
@@
#ifdef __KERNEL__
#include <linux/in.h>
#ifdef __KERNEL__
#include <linux/in.h>
+#include <linux/kref.h>
#include <linux/mm.h>
#include <linux/mm.h>
+#include <linux/namei.h>
#include <linux/pagemap.h>
#include <linux/rbtree.h>
#include <linux/rwsem.h>
#include <linux/pagemap.h>
#include <linux/rbtree.h>
#include <linux/rwsem.h>
@@
-69,9
+71,8
@@
struct nfs_access_entry {
struct nfs4_state;
struct nfs_open_context {
struct nfs4_state;
struct nfs_open_context {
- atomic_t count;
- struct vfsmount *vfsmnt;
- struct dentry *dentry;
+ struct kref kref;
+ struct path path;
struct rpc_cred *cred;
struct nfs4_state *state;
fl_owner_t lockowner;
struct rpc_cred *cred;
struct nfs4_state *state;
fl_owner_t lockowner;
@@
-155,13
+156,9
@@
struct nfs_inode {
/*
* This is the list of dirty unwritten pages.
*/
/*
* This is the list of dirty unwritten pages.
*/
- spinlock_t req_lock;
- struct list_head dirty;
- struct list_head commit;
struct radix_tree_root nfs_page_tree;
struct radix_tree_root nfs_page_tree;
- unsigned int ndirty,
- ncommit,
+ unsigned long ncommit,
npages;
/* Open contexts for shared mmap writes */
npages;
/* Open contexts for shared mmap writes */
@@
-187,6
+184,7
@@
struct nfs_inode {
#define NFS_INO_INVALID_ACCESS 0x0008 /* cached access cred invalid */
#define NFS_INO_INVALID_ACL 0x0010 /* cached acls are invalid */
#define NFS_INO_REVAL_PAGECACHE 0x0020 /* must revalidate pagecache */
#define NFS_INO_INVALID_ACCESS 0x0008 /* cached access cred invalid */
#define NFS_INO_INVALID_ACL 0x0010 /* cached acls are invalid */
#define NFS_INO_REVAL_PAGECACHE 0x0020 /* must revalidate pagecache */
+#define NFS_INO_REVAL_FORCED 0x0040 /* force revalidation ignoring a delegation */
/*
* Bit offsets in flags field
/*
* Bit offsets in flags field
@@
-409,8
+407,8
@@
extern void nfs_release_automount_timer(void);
/*
* linux/fs/nfs/unlink.c
*/
/*
* linux/fs/nfs/unlink.c
*/
-extern int nfs_async_unlink(struct
dentry *
);
-extern void nfs_complete_unlink(struct dentry *);
+extern int nfs_async_unlink(struct
inode *dir, struct dentry *dentry
);
+extern void nfs_complete_unlink(struct dentry *
dentry, struct inode *
);
/*
* linux/fs/nfs/write.c
/*
* linux/fs/nfs/write.c
@@
-455,7
+453,7
@@
nfs_have_writebacks(struct inode *inode)
/*
* Allocate nfs_write_data structures
*/
/*
* Allocate nfs_write_data structures
*/
-extern struct nfs_write_data *nfs_writedata_alloc(
size_t len
);
+extern struct nfs_write_data *nfs_writedata_alloc(
unsigned int npages
);
/*
* linux/fs/nfs/read.c
/*
* linux/fs/nfs/read.c
@@
-469,7
+467,7
@@
extern void nfs_readdata_release(void *data);
/*
* Allocate nfs_read_data structures
*/
/*
* Allocate nfs_read_data structures
*/
-extern struct nfs_read_data *nfs_readdata_alloc(
size_t len
);
+extern struct nfs_read_data *nfs_readdata_alloc(
unsigned int npages
);
/*
* linux/fs/nfs3proc.c
/*
* linux/fs/nfs3proc.c
@@
-496,21
+494,18
@@
static inline void nfs3_forget_cached_acls(struct inode *inode)
/*
* linux/fs/mount_clnt.c
/*
* linux/fs/mount_clnt.c
- * (Used only by nfsroot module)
*/
*/
-extern int nfs
root_mount(struct sockaddr_in *, char *, struct nfs_fh
*,
-
int, int
);
+extern int nfs
_mount(struct sockaddr *, size_t, char *, char
*,
+
int, int, struct nfs_fh *
);
/*
* inline functions
*/
/*
* inline functions
*/
-static inline loff_t
-nfs_size_to_loff_t(__u64 size)
+static inline loff_t nfs_size_to_loff_t(__u64 size)
{
{
- loff_t maxsz = (((loff_t) ULONG_MAX) << PAGE_CACHE_SHIFT) + PAGE_CACHE_SIZE - 1;
- if (size > maxsz)
- return maxsz;
+ if (size > (__u64) OFFSET_MAX - 1)
+ return OFFSET_MAX - 1;
return (loff_t) size;
}
return (loff_t) size;
}
@@
-557,6
+552,7
@@
extern void * nfs_root_data(void);
#define NFSDBG_ROOT 0x0080
#define NFSDBG_CALLBACK 0x0100
#define NFSDBG_CLIENT 0x0200
#define NFSDBG_ROOT 0x0080
#define NFSDBG_CALLBACK 0x0100
#define NFSDBG_CLIENT 0x0200
+#define NFSDBG_MOUNT 0x0400
#define NFSDBG_ALL 0xFFFF
#ifdef __KERNEL__
#define NFSDBG_ALL 0xFFFF
#ifdef __KERNEL__