From 31e4a030f58f7ecb0cbc4236cab3d7cc25f29ccb Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Thu, 22 Jan 2015 19:36:59 -0500 Subject: [PATCH] afs: refactor afs_linux_dentry_revalidate No functional change. Separate the if (locked && vcp->mvstat == 1) { ... } conditional into if (locked) { if (vcp->mvstat == 1) { ... } } in preparation for another change. Change-Id: I1fe42ed7771882ce365d9359a4e6187c283592a8 Reviewed-on: http://gerrit.openafs.org/11692 Reviewed-by: Perry Ruiter Reviewed-by: Chas Williams - CONTRACTOR Reviewed-by: Benjamin Kaduk Tested-by: BuildBot --- src/afs/LINUX/osi_vnodeops.c | 48 +++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c index 70f2fb37e..de2af8254 100644 --- a/src/afs/LINUX/osi_vnodeops.c +++ b/src/afs/LINUX/osi_vnodeops.c @@ -1171,29 +1171,31 @@ afs_linux_dentry_revalidate(struct dentry *dp, int flags) locked = 1; } - if (locked && vcp->mvstat == 1) { /* mount point */ - if (vcp->mvid && (vcp->f.states & CMValid)) { - int tryEvalOnly = 0; - int code = 0; - struct vrequest *treq = NULL; - - code = afs_CreateReq(&treq, credp); - if (code) { - dput(parent); - goto bad_dentry; - } - if ((strcmp(dp->d_name.name, ".directory") == 0)) { - tryEvalOnly = 1; - } - if (tryEvalOnly) - code = afs_TryEvalFakeStat(&vcp, &fakestate, treq); - else - code = afs_EvalFakeStat(&vcp, &fakestate, treq); - afs_DestroyReq(treq); - if ((tryEvalOnly && vcp->mvstat == 1) || code) { - /* a mount point, not yet replaced by its directory */ - dput(parent); - goto bad_dentry; + if (locked) { + if (vcp->mvstat == 1) { /* mount point */ + if (vcp->mvid && (vcp->f.states & CMValid)) { + int tryEvalOnly = 0; + int code = 0; + struct vrequest *treq = NULL; + + code = afs_CreateReq(&treq, credp); + if (code) { + dput(parent); + goto bad_dentry; + } + if ((strcmp(dp->d_name.name, ".directory") == 0)) { + tryEvalOnly = 1; + } + if (tryEvalOnly) + code = afs_TryEvalFakeStat(&vcp, &fakestate, treq); + else + code = afs_EvalFakeStat(&vcp, &fakestate, treq); + afs_DestroyReq(treq); + if ((tryEvalOnly && vcp->mvstat == 1) || code) { + /* a mount point, not yet replaced by its directory */ + dput(parent); + goto bad_dentry; + } } } } -- 2.39.5