diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 16:39:20 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 16:39:20 (GMT) |
| commit | 52c6738b7f46255217942062dfa60daa7cf72510 (patch) | |
| tree | 9fa9fcdef7b44f6d71e5bb5de0e248a368808cc1 /include | |
| parent | 3b72e4415438538c0967fd1aee930f688ccdf6dd (diff) | |
| parent | ec9a05c94c7cd00b4f0ab126c3d394f2fc2e4712 (diff) | |
| download | linux-52c6738b7f46255217942062dfa60daa7cf72510.tar.xz | |
Merge git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
NFS: use correct fs type for v4 submounts and referrals
Make nfs_file_cred more robust.
NFS: Enable NFSv4 callback server to listen on AF_INET6 sockets
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/nfs_fs.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h index ac8d023..4eaa834 100644 --- a/include/linux/nfs_fs.h +++ b/include/linux/nfs_fs.h @@ -367,8 +367,12 @@ static inline struct nfs_open_context *nfs_file_open_context(struct file *filp) static inline struct rpc_cred *nfs_file_cred(struct file *file) { - if (file != NULL) - return nfs_file_open_context(file)->cred; + if (file != NULL) { + struct nfs_open_context *ctx = + nfs_file_open_context(file); + if (ctx) + return ctx->cred; + } return NULL; } |