diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-03-24 17:03:14 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-03-24 17:03:14 -0400 |
| commit | 0acd2201920d0968919f4f5797d63f7b6f2b19d4 (patch) | |
| tree | 9b241d264f42eff3ff4eeffb67616fca0490e460 /fs/nfs/nfs4_fs.h | |
| parent | 8f70e95f9f4159184f557a1db60c909d7c1bd2e3 (diff) | |
| parent | 35124a0994fc02545b14b9fa3aad000b3331f1c0 (diff) | |
Merge branch 'nfs-for-2.6.39' into nfs-for-next
Diffstat (limited to 'fs/nfs/nfs4_fs.h')
| -rw-r--r-- | fs/nfs/nfs4_fs.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h index 72e5f1a2883e..e1c261ddd65d 100644 --- a/fs/nfs/nfs4_fs.h +++ b/fs/nfs/nfs4_fs.h | |||
| @@ -263,6 +263,8 @@ extern int nfs4_proc_destroy_session(struct nfs4_session *); | |||
| 263 | extern int nfs4_init_session(struct nfs_server *server); | 263 | extern int nfs4_init_session(struct nfs_server *server); |
| 264 | extern int nfs4_proc_get_lease_time(struct nfs_client *clp, | 264 | extern int nfs4_proc_get_lease_time(struct nfs_client *clp, |
| 265 | struct nfs_fsinfo *fsinfo); | 265 | struct nfs_fsinfo *fsinfo); |
| 266 | extern int nfs4_proc_layoutcommit(struct nfs4_layoutcommit_data *data, | ||
| 267 | bool sync); | ||
| 266 | 268 | ||
| 267 | static inline bool | 269 | static inline bool |
| 268 | is_ds_only_client(struct nfs_client *clp) | 270 | is_ds_only_client(struct nfs_client *clp) |