[PATCH] nfsd4: block metadata ops during grace period
We currently return err_grace if a user attempts a non-reclaim open during the grace period. But we also need to prevent renames and removes, at least, to ensure clients have the chance to recover state on files before they are moved or deleted. Of course, local users could also do renames and removes during the lease period, and there's not much we can do about that. This at least will help with remote users. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
496400014f
commit
c815afc73e
|
@ -536,6 +536,8 @@ nfsd4_remove(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_rem
|
||||||
{
|
{
|
||||||
int status;
|
int status;
|
||||||
|
|
||||||
|
if (nfs4_in_grace())
|
||||||
|
return nfserr_grace;
|
||||||
status = nfsd_unlink(rqstp, current_fh, 0, remove->rm_name, remove->rm_namelen);
|
status = nfsd_unlink(rqstp, current_fh, 0, remove->rm_name, remove->rm_namelen);
|
||||||
if (status == nfserr_symlink)
|
if (status == nfserr_symlink)
|
||||||
return nfserr_notdir;
|
return nfserr_notdir;
|
||||||
|
@ -554,6 +556,9 @@ nfsd4_rename(struct svc_rqst *rqstp, struct svc_fh *current_fh,
|
||||||
|
|
||||||
if (!save_fh->fh_dentry)
|
if (!save_fh->fh_dentry)
|
||||||
return status;
|
return status;
|
||||||
|
if (nfs4_in_grace() && !(save_fh->fh_export->ex_flags
|
||||||
|
& NFSEXP_NOSUBTREECHECK))
|
||||||
|
return nfserr_grace;
|
||||||
status = nfsd_rename(rqstp, save_fh, rename->rn_sname,
|
status = nfsd_rename(rqstp, save_fh, rename->rn_sname,
|
||||||
rename->rn_snamelen, current_fh,
|
rename->rn_snamelen, current_fh,
|
||||||
rename->rn_tname, rename->rn_tnamelen);
|
rename->rn_tname, rename->rn_tnamelen);
|
||||||
|
|
Loading…
Reference in a new issue