core: Undo optimization in FileTracker

to reduce the amount of changes in #162

We may also need the reference to Inode should we decide to call
Vfs.close from here.

Signed-off-by: Christian Kohlschütter <[email protected]>

Author: kohlschuetter

core/src/main/java/org/dcache/nfs/v4/FileTracker.java

@@ -341,8 +341,7 @@ public OpenRecord addOpen(NFS4Client client, StateOwner owner, Inode inode, int
             stateid = state.stateid();
             OpenState openState = new OpenState(client, owner, stateid, shareAccess, shareDeny);
             opens.add(openState);
-            Opaque fileIdKey = inode.getFileIdKey();
-            state.addDisposeListener(s -> removeOpen(fileIdKey, stateid));
+            state.addDisposeListener(s -> removeOpen(inode, stateid));
             stateid.bumpSeqid();
 
             // we need to return copy to avoid modification by concurrent opens
@@ -532,10 +531,8 @@ public int getShareAccess(NFS4Client client, Inode inode, Opaque stateid)
      * @param stateid associated with the open.
      */
     void removeOpen(Inode inode, stateid4 stateid) {
-        removeOpen(inode.getFileIdKey(), stateid);
-    }
 
-    void removeOpen(Opaque fileId, stateid4 stateid) {
+        Opaque fileId = inode.getFileIdKey();
         Lock lock = filesLock.get(fileId);
         lock.lock();
         try {