git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'nfs-for-2.6.37' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
[pandora-kernel.git]
/
include
/
linux
/
nfs_fs.h
diff --git
a/include/linux/nfs_fs.h
b/include/linux/nfs_fs.h
index
d929b18
..
a46e430
100644
(file)
--- a/
include/linux/nfs_fs.h
+++ b/
include/linux/nfs_fs.h
@@
-185,7
+185,7
@@
struct nfs_inode {
struct nfs4_cached_acl *nfs4_acl;
/* NFSv4 state */
struct list_head open_states;
- struct nfs_delegation
*delegation;
+ struct nfs_delegation
__rcu
*delegation;
fmode_t delegation_state;
struct rw_semaphore rwsem;
#endif /* CONFIG_NFS_V4*/