diff options
| author | Linus Torvalds | 2008-10-20 18:39:20 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2008-10-20 18:39:20 +0200 |
| commit | 52c6738b7f46255217942062dfa60daa7cf72510 (patch) | |
| tree | 9fa9fcdef7b44f6d71e5bb5de0e248a368808cc1 /fs/nfs/nfs4proc.c | |
| parent | Merge branch 'for-next' of git://git.o-hand.com/linux-mfd (diff) | |
| parent | NFS: use correct fs type for v4 submounts and referrals (diff) | |
| download | kernel-qcow2-linux-52c6738b7f46255217942062dfa60daa7cf72510.tar.gz kernel-qcow2-linux-52c6738b7f46255217942062dfa60daa7cf72510.tar.xz kernel-qcow2-linux-52c6738b7f46255217942062dfa60daa7cf72510.zip | |
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 'fs/nfs/nfs4proc.c')
| -rw-r--r-- | fs/nfs/nfs4proc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index c910413eaeca..83e700a2b0c0 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -1659,8 +1659,10 @@ nfs4_proc_setattr(struct dentry *dentry, struct nfs_fattr *fattr, struct nfs_open_context *ctx; ctx = nfs_file_open_context(sattr->ia_file); - cred = ctx->cred; - state = ctx->state; + if (ctx) { + cred = ctx->cred; + state = ctx->state; + } } status = nfs4_do_setattr(inode, cred, fattr, sattr, state); |