diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-04-01 13:28:15 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-04-01 13:28:15 -0400 |
| commit | cc85906110e26fe8537c3bdbc08a74ae8110030b (patch) | |
| tree | 891813098ede3dba4d5ff3b83b1f7b491367ad2f /include/linux/nfs_fs.h | |
| parent | c09bca786ff941ed17c5f381c4eca5b106808c51 (diff) | |
| parent | c69da774b28e01e062e0a3aba7509f2dcfd2a11a (diff) | |
| download | op-kernel-dev-cc85906110e26fe8537c3bdbc08a74ae8110030b.zip op-kernel-dev-cc85906110e26fe8537c3bdbc08a74ae8110030b.tar.gz | |
Merge branch 'devel' into for-linus
Diffstat (limited to 'include/linux/nfs_fs.h')
| -rw-r--r-- | include/linux/nfs_fs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h index 8cc8807..bde2557 100644 --- a/include/linux/nfs_fs.h +++ b/include/linux/nfs_fs.h @@ -166,8 +166,7 @@ struct nfs_inode { */ struct radix_tree_root nfs_page_tree; - unsigned long ncommit, - npages; + unsigned long npages; /* Open contexts for shared mmap writes */ struct list_head open_files; @@ -207,6 +206,7 @@ struct nfs_inode { #define NFS_INO_STALE (1) /* possible stale inode */ #define NFS_INO_ACL_LRU_SET (2) /* Inode is on the LRU list */ #define NFS_INO_MOUNTPOINT (3) /* inode is remote mountpoint */ +#define NFS_INO_FLUSHING (4) /* inode is flushing out data */ static inline struct nfs_inode *NFS_I(const struct inode *inode) { |
