i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nfs4: Solve confusion between bigtime_t and seconds

Browse Source
This commit is contained in:
Pawel Dziepak
2012-07-02 21:07:52 +02:00
parent 17c2a48585
commit ceed5fe076
3 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/nfs4/Inode.cpp
+17 -6
View File
@@ -892,6 +892,8 @@ bool
Inode::_HandleErrors(uint32 nfs4Error, RPC::Server* serv, Inode::_HandleErrors(uint32 nfs4Error, RPC::Server* serv,
OpenFileCookie* cookie) OpenFileCookie* cookie)
{ {
uint32 leaseTime;
switch (nfs4Error) { switch (nfs4Error) {
case NFS4_OK: case NFS4_OK:
return false; return false;
@@ -900,11 +902,12 @@ Inode::_HandleErrors(uint32 nfs4Error, RPC::Server* serv,
case NFS4ERR_LOCKED: case NFS4ERR_LOCKED:
case NFS4ERR_DELAY: case NFS4ERR_DELAY:
if (cookie == NULL) { if (cookie == NULL) {
snooze_etc(5 * 1000000, B_SYSTEM_TIMEBASE, B_RELATIVE_TIMEOUT); snooze_etc(sSecToBigTime(5), B_SYSTEM_TIMEBASE,
B_RELATIVE_TIMEOUT);
return true; return true;
} else if ((cookie->fMode & O_NONBLOCK) == 0) { } else if ((cookie->fMode & O_NONBLOCK) == 0) {
status_t result = acquire_sem_etc(cookie->fSnoozeCancel, 1, status_t result = acquire_sem_etc(cookie->fSnoozeCancel, 1,
B_RELATIVE_TIMEOUT, 5 * 1000000); B_RELATIVE_TIMEOUT, sSecToBigTime(5));
if (result == B_TIMED_OUT) if (result == B_TIMED_OUT)
return true; return true;
else { else {
@@ -916,14 +919,14 @@ Inode::_HandleErrors(uint32 nfs4Error, RPC::Server* serv,
// server is in grace period, we need to wait // server is in grace period, we need to wait
case NFS4ERR_GRACE: case NFS4ERR_GRACE:
leaseTime = fFilesystem->NFSServer()->LeaseTime();
if (cookie == NULL) { if (cookie == NULL) {
snooze_etc(fFilesystem->NFSServer()->LeaseTime() / 3, snooze_etc(sSecToBigTime(leaseTime) / 3, B_SYSTEM_TIMEBASE,
B_SYSTEM_TIMEBASE, B_RELATIVE_TIMEOUT); B_RELATIVE_TIMEOUT);
return true; return true;
} else if ((cookie->fMode & O_NONBLOCK) == 0) { } else if ((cookie->fMode & O_NONBLOCK) == 0) {
status_t result = acquire_sem_etc(cookie->fSnoozeCancel, 1, status_t result = acquire_sem_etc(cookie->fSnoozeCancel, 1,
B_RELATIVE_TIMEOUT, B_RELATIVE_TIMEOUT, sSecToBigTime(leaseTime) / 3);
fFilesystem->NFSServer()->LeaseTime() / 3);
if (result == B_TIMED_OUT) if (result == B_TIMED_OUT)
return true; return true;
else { else {
@@ -952,6 +955,14 @@ Inode::_HandleErrors(uint32 nfs4Error, RPC::Server* serv,
fFilesystem->Migrate(serv); fFilesystem->Migrate(serv);
return true; return true;
// lease has expired
case NFS4ERR_EXPIRED:
if (cookie != NULL) {
fFilesystem->NFSServer()->ClientId(cookie->fClientId, true);
return true;
} else
return false;
default: default:
return false; return false;
} }
src/add-ons/kernel/file_systems/nfs4/NFS4Defs.h
+7
View File
@@ -309,5 +309,12 @@ enum Errors {
}; };
static inline bigtime_t
sSecToBigTime(uint32 sec)
{
return static_cast<bigtime_t>(sec) * 1000000;
}
#endif // NFS4DEFS_H #endif // NFS4DEFS_H
src/add-ons/kernel/file_systems/nfs4/NFS4Server.cpp
+4 -4
View File
@@ -181,7 +181,7 @@ uint64
NFS4Server::ClientId(uint64 prevId, bool forceNew) NFS4Server::ClientId(uint64 prevId, bool forceNew)
{ {
MutexLocker _(fClientIdLock); MutexLocker _(fClientIdLock);
if (fClientIdLastUse + (time_t)LeaseTime() < time(NULL) if (fUseCount == 0 && fClientIdLastUse + (time_t)LeaseTime() < time(NULL)
|| forceNew && fClientId == prevId) { || forceNew && fClientId == prevId) {
Request request(fServer); Request request(fServer);
@@ -256,7 +256,7 @@ NFS4Server::_GetLeaseTime()
return B_BAD_VALUE; return B_BAD_VALUE;
} }
fLeaseTime = values[0].fData.fValue32 * 1000000; fLeaseTime = values[0].fData.fValue32;
return B_OK; return B_OK;
} }
@@ -295,8 +295,8 @@ NFS4Server::_Renewal()
{ {
while (!fThreadCancel) { while (!fThreadCancel) {
// TODO: operations like OPEN, READ, CLOSE, etc also renew leases // TODO: operations like OPEN, READ, CLOSE, etc also renew leases
snooze_etc(fLeaseTime - 2, B_SYSTEM_TIMEBASE, B_RELATIVE_TIMEOUT snooze_etc(sSecToBigTime(fLeaseTime - 2), B_SYSTEM_TIMEBASE,
| B_CAN_INTERRUPT); B_RELATIVE_TIMEOUT | B_CAN_INTERRUPT);
uint64 clientId = fClientId; uint64 clientId = fClientId;