diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2008-07-03 16:24:06 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2008-07-03 16:24:06 -0400 |
| commit | e86322f611eef95aafaf726fd3965e5b211f1985 (patch) | |
| tree | 28547e26df4fc6ae671dc8cc6912a53717e4db08 /include/linux/fdtable.h | |
| parent | b001a1b6aa960949a24c2cdc28257dfcc9428d74 (diff) | |
| parent | 8948896c9e098c6fd31a6a698a598a7cbd7fa40e (diff) | |
Merge branch 'for-bfields' of git://linux-nfs.org/~tomtucker/xprt-switch-2.6 into for-2.6.27
Diffstat (limited to 'include/linux/fdtable.h')
| -rw-r--r-- | include/linux/fdtable.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h index a118f3c0b240..4aab6f12cfab 100644 --- a/include/linux/fdtable.h +++ b/include/linux/fdtable.h | |||
| @@ -93,6 +93,7 @@ struct files_struct *get_files_struct(struct task_struct *); | |||
| 93 | void put_files_struct(struct files_struct *fs); | 93 | void put_files_struct(struct files_struct *fs); |
| 94 | void reset_files_struct(struct files_struct *); | 94 | void reset_files_struct(struct files_struct *); |
| 95 | int unshare_files(struct files_struct **); | 95 | int unshare_files(struct files_struct **); |
| 96 | struct files_struct *dup_fd(struct files_struct *, int *); | ||
| 96 | 97 | ||
| 97 | extern struct kmem_cache *files_cachep; | 98 | extern struct kmem_cache *files_cachep; |
| 98 | 99 | ||