diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:30:16 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:30:16 -0400 |
| commit | 15dbb5a3f971a28040ae6cbcd8bbdf19b629fa83 (patch) | |
| tree | e65562d7300ac653207b1e45ec7e5960ddf78fff /fs/nfs/delegation.c | |
| parent | be697c3f137c9ed808753bbbc5d7751c6e5303fc (diff) | |
| parent | 5fadd053d9bb4345ec6f405d24db4e7eb49cf81e (diff) | |
Merge branch 'master'
Diffstat (limited to 'fs/nfs/delegation.c')
| -rw-r--r-- | fs/nfs/delegation.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c index 4a36839f0bbd..44135af9894c 100644 --- a/fs/nfs/delegation.c +++ b/fs/nfs/delegation.c | |||
| @@ -142,7 +142,7 @@ static void nfs_msync_inode(struct inode *inode) | |||
| 142 | /* | 142 | /* |
| 143 | * Basic procedure for returning a delegation to the server | 143 | * Basic procedure for returning a delegation to the server |
| 144 | */ | 144 | */ |
| 145 | int nfs_inode_return_delegation(struct inode *inode) | 145 | int __nfs_inode_return_delegation(struct inode *inode) |
| 146 | { | 146 | { |
| 147 | struct nfs4_client *clp = NFS_SERVER(inode)->nfs4_state; | 147 | struct nfs4_client *clp = NFS_SERVER(inode)->nfs4_state; |
| 148 | struct nfs_inode *nfsi = NFS_I(inode); | 148 | struct nfs_inode *nfsi = NFS_I(inode); |