diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-08-11 12:01:11 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-08-11 12:01:11 -0700 |
| commit | 3ca5168c598bb5207dc70a3145c8093ffcdabfd6 (patch) | |
| tree | b83515985abe1894607839afd211c2c25d1d790c /include/linux/nfs_fs.h | |
| parent | e91e82388c2ed1739b082c2afd63ba62a312ec36 (diff) | |
| parent | 9abd59b0df155835a970c2b9c8f93367eb793797 (diff) | |
Merge branch 'upstream/android-3.0' into linaro-android-3.0
Diffstat (limited to 'include/linux/nfs_fs.h')
| -rw-r--r-- | include/linux/nfs_fs.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h index 1b93b9c60e5..b522370fcc2 100644 --- a/include/linux/nfs_fs.h +++ b/include/linux/nfs_fs.h @@ -99,9 +99,10 @@ struct nfs_open_context { struct nfs_open_dir_context { struct rpc_cred *cred; + unsigned long attr_gencount; __u64 dir_cookie; __u64 dup_cookie; - int duped; + signed char duped; }; /* |