jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-19 07:20:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

disconnected-reply-no-locking-yet-20090128

Browse Source 
LICENSE IPL10
FIXES 124202

don't lock files before replaying changes yet
This commit is contained in:
Simon Wilkinson 2009-01-28 21:02:16 +00:00 committed by Derrick Brashear
parent 1cca08960b
commit cc2f0d2bc5
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/afs/afs_disconnected.c
View File

@ -1138,7 +1138,7 @@ int afs_ResyncDisconFiles(struct vrequest *areq, struct AFS_UCRED *acred)
tvc->f.ddirty_flags &= ~VDisconCreate; tvc->f.ddirty_flags &= ~VDisconCreate;
tvc->f.ddirty_flags |= VDisconCreated; tvc->f.ddirty_flags |= VDisconCreated;
} }
#if 0
/* Get server write lock. */ /* Get server write lock. */
do { do {
tc = afs_Conn(&tvc->f.fid, areq, SHARED_LOCK); tc = afs_Conn(&tvc->f.fid, areq, SHARED_LOCK);
@ -1164,7 +1164,7 @@ int afs_ResyncDisconFiles(struct vrequest *areq, struct AFS_UCRED *acred)
if (code) if (code)
goto next_file; goto next_file;
#endif
if (tvc->f.ddirty_flags & VDisconRename) { if (tvc->f.ddirty_flags & VDisconRename) {
/* If we're renaming the file, do so now */ /* If we're renaming the file, do so now */
code = afs_ProcessOpRename(tvc, areq); code = afs_ProcessOpRename(tvc, areq);
@ -1228,6 +1228,7 @@ int afs_ResyncDisconFiles(struct vrequest *areq, struct AFS_UCRED *acred)
unlock_srv_file: unlock_srv_file:
/* Release server write lock. */ /* Release server write lock. */
#if 0
do { do {
tc = afs_Conn(&tvc->f.fid, areq, SHARED_LOCK); tc = afs_Conn(&tvc->f.fid, areq, SHARED_LOCK);
if (tc) { if (tc) {
@ -1247,7 +1248,7 @@ unlock_srv_file:
AFS_STATS_FS_RPCIDX_RELEASELOCK, AFS_STATS_FS_RPCIDX_RELEASELOCK,
SHARED_LOCK, SHARED_LOCK,
NULL)); NULL));
#endif
next_file: next_file:
ObtainWriteLock(&afs_disconDirtyLock, 710); ObtainWriteLock(&afs_disconDirtyLock, 710);
if (code == 0) { if (code == 0) {

2
src/afs/afs_pioctl.c
View File

@ -4700,11 +4700,11 @@ DECL_PIOCTL(PDiscon)
if (force) { if (force) {
afs_DisconDiscardAll(*acred); afs_DisconDiscardAll(*acred);
} }
afs_ClearAllStatdFlag();
afs_is_disconnected = 0; afs_is_disconnected = 0;
afs_is_discon_rw = 0; afs_is_discon_rw = 0;
printf("\nSync succeeded. You are back online.\n"); printf("\nSync succeeded. You are back online.\n");
} }
afs_ClearAllStatdFlag();
ReleaseWriteLock(&afs_discon_lock); ReleaseWriteLock(&afs_discon_lock);
break; break;