diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2010-03-09 23:22:08 +0100 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2010-03-09 23:22:08 +0100 |
| commit | e739cf1da48e841bc5d744a99764c1a668b4bdd2 (patch) | |
| tree | 1d39318bbbcdd66ad8cd34823ad9befb7af08b1f /fs/nfsd/nfs4state.c | |
| parent | nfsd4: document lease/grace-period limits (diff) | |
| parent | Linux 2.6.34-rc1 (diff) | |
| download | linux-e739cf1da48e841bc5d744a99764c1a668b4bdd2.tar.xz linux-e739cf1da48e841bc5d744a99764c1a668b4bdd2.zip | |
Merge commit 'v2.6.34-rc1' into for-2.6.35-incoming
Diffstat (limited to 'fs/nfsd/nfs4state.c')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 6edfe23694e6..efef7f2442d5 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -1998,7 +1998,9 @@ nfs4_file_downgrade(struct file *filp, unsigned int share_access) { if (share_access & NFS4_SHARE_ACCESS_WRITE) { drop_file_write_access(filp); + spin_lock(&filp->f_lock); filp->f_mode = (filp->f_mode | FMODE_READ) & ~FMODE_WRITE; + spin_unlock(&filp->f_lock); } } |