diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-12-03 21:27:36 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-12-03 21:27:36 -0500 |
| commit | 7285f2d2ffd4b7ab4ffb70a47759ee209c30017b (patch) | |
| tree | 255cdddc72429f013b3bcf5c51d1818cb3e3bd51 /fs/nfs/nfs4proc.c | |
| parent | 0b08b07507d5ae733408fd4ebda1cd89d3a840ef (diff) | |
| parent | 44ed3556bad809797f7b06a4a88918fd8a23d6fe (diff) | |
| download | blackbird-op-linux-7285f2d2ffd4b7ab4ffb70a47759ee209c30017b.tar.gz blackbird-op-linux-7285f2d2ffd4b7ab4ffb70a47759ee209c30017b.zip | |
Merge branch 'devel' into linux-next
Diffstat (limited to 'fs/nfs/nfs4proc.c')
| -rw-r--r-- | fs/nfs/nfs4proc.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index df8a734f1c05..0f9b7541e049 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -275,6 +275,13 @@ static int nfs4_handle_exception(const struct nfs_server *server, int errorcode, /* FALLTHROUGH */ #endif /* !defined(CONFIG_NFS_V4_1) */ case -NFS4ERR_FILE_OPEN: + if (exception->timeout > HZ) { + /* We have retried a decent amount, time to + * fail + */ + ret = -EBUSY; + break; + } case -NFS4ERR_GRACE: case -NFS4ERR_DELAY: ret = nfs4_delay(server->client, &exception->timeout); |
