leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] nfsd4: fix open_downgrade

Browse Source 
Bad bookkeeping of the share reservations when handling open upgrades was
causing open downgrade to fail.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
J. Bruce Fields
2006-01-18 17:43:38 -08:00
committed by Linus Torvalds
parent fb553c0f17
commit 6c26d08f02
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fs/nfsd/nfs4state.c
View File

@@ -1609,26 +1609,26 @@ nfs4_upgrade_open(struct svc_rqst *rqstp, struct svc_fh *cur_fh, struct nfs4_sta
{ {
struct file *filp = stp->st_vfs_file; struct file *filp = stp->st_vfs_file;
struct inode *inode = filp->f_dentry->d_inode; struct inode *inode = filp->f_dentry->d_inode;
unsigned int share_access; unsigned int share_access, new_writer;
int status; int status;
set_access(&share_access, stp->st_access_bmap); set_access(&share_access, stp->st_access_bmap);
share_access = ~share_access; new_writer = (~share_access) & open->op_share_access
share_access &= open->op_share_access; & NFS4_SHARE_ACCESS_WRITE;
if (!(share_access & NFS4_SHARE_ACCESS_WRITE))
return nfsd4_truncate(rqstp, cur_fh, open);
if (new_writer) {
status = get_write_access(inode); status = get_write_access(inode);
if (status) if (status)
return nfserrno(status); return nfserrno(status);
}
status = nfsd4_truncate(rqstp, cur_fh, open); status = nfsd4_truncate(rqstp, cur_fh, open);
if (status) { if (status) {
if (new_writer)
put_write_access(inode); put_write_access(inode);
return status; return status;
} }
/* remember the open */ /* remember the open */
filp->f_mode = (filp->f_mode | FMODE_WRITE) & ~FMODE_READ; filp->f_mode |= open->op_share_access;
set_bit(open->op_share_access, &stp->st_access_bmap); set_bit(open->op_share_access, &stp->st_access_bmap);
set_bit(open->op_share_deny, &stp->st_deny_bmap); set_bit(open->op_share_deny, &stp->st_deny_bmap);