J. Bruce Fields:
> Any change to any of the links pointing to an entry should also break
> delegations.
>
> Signed-off-by: J. Bruce Fields <bfields@xxxxxxxxxx>
> ---
> fs/nfsd/vfs.c | 27 +++++++++++++++++++++++----
> 1 files changed, 23 insertions(+), 4 deletions(-)
>
> diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
> index 839ed88..f31321a 100644
> --- a/fs/nfsd/vfs.c
> +++ b/fs/nfsd/vfs.c
> @@ -272,6 +272,13 @@ out:
> return err;
> }
>
> +static int nfsd_break_lease(struct inode *inode)
> +{
> + if (!S_ISREG(inode->i_mode))
> + return 0;
> + return break_lease(inode, O_WRONLY | O_NONBLOCK);
Hi Bruce,
break_lease will return -EWOULDBLOCK here if break success, not 0.
at __break_lease:
1193 */
1194 int __break_lease(struct inode *inode, unsigned int mode)
1195 {
... ...
1253 if (i_have_this_lease || (mode & O_NONBLOCK)) {
1254 error = -EWOULDBLOCK;
1255 goto out;
1256 }
... ...
1283 out:
1284 unlock_flocks();
1285 if (!IS_ERR(new_fl))
1286 locks_free_lock(new_fl);
1287 return error;
1288 }
If we just return the error -EWOULDBLOCK (which mapped to -EAGAIN) at
nfsd_break_lease(), the NFS request will be drop for -EAGAIN is mapped
to nfserr_dropit at nfserrno(). As that, client will hang up about 60s
until a retry success.
Maybe we should have a check here as:
- return break_lease(inode, O_WRONLY | O_NONBLOCK);
+ int status = break_lease(inode, O_WRONLY | O_NONBLOCK);
+ return -EWOULDBLOCK == status ? 0 : status;
--
----
thanks
Mi Jinlong
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
