core: Replace VirtualFileSystem.getStatType with getattr EnumSet

As per request, let's handle getting the Stat type not as a special case
but via a generalizable getattr method that takes an EnumSet of
StatAttributes.

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

Author: kohlschuetter

core/src/main/java/org/dcache/nfs/v3/MountServer.java

@@ -105,15 +105,15 @@ public mountres3 MOUNTPROC3_MNT_3(RpcCall call$, dirpath arg1) {
         try {
 
             Inode rootInode = path2Inode(_vfs, mountPoint);
-            Stat.Type type = _vfs.getStatType(rootInode);
+            Stat.Type type = _vfs.getattr(rootInode, Stat.STAT_ATTRIBUTES_TYPE_ONLY).type();
 
             if (type == Stat.Type.SYMLINK) {
                 /*
                  * we resolve symlink only once
                  */
                 String path = _vfs.readlink(rootInode);
                 rootInode = path2Inode(_vfs, path);
-                type = _vfs.getStatType(rootInode);
+                type = _vfs.getattr(rootInode, Stat.STAT_ATTRIBUTES_TYPE_ONLY).type();
             }
 
             if (type != Stat.Type.DIRECTORY) {

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

@@ -55,7 +55,7 @@ public void process(CompoundContext context, nfs_resop4 result) throws ChimeraNF
 
         Inode parent = context.currentInode();
 
-        Stat.Type inodeStatType = context.getFs().getStatType(context.savedInode());
+        Stat.Type inodeStatType = context.getFs().getattr(context.savedInode(), Stat.STAT_ATTRIBUTES_TYPE_ONLY).type();
         if (inodeStatType == Stat.Type.DIRECTORY) {
             throw new IsDirException("Can't hard-link a directory");
         }

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

@@ -37,6 +37,7 @@
 import org.dcache.nfs.v4.xdr.offset4;
 import org.dcache.nfs.v4.xdr.state_owner4;
 import org.dcache.nfs.vfs.Inode;
+import org.dcache.nfs.vfs.Stat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -57,7 +58,7 @@ public void process(CompoundContext context, nfs_resop4 result) throws IOExcepti
             throw new InvalException("zero lock len");
         }
 
-        switch (context.getFs().getStatType(inode)) {
+        switch (context.getFs().getattr(inode, Stat.STAT_ATTRIBUTES_TYPE_ONLY).type()) {
             case REGULAR:
                 // OK
                 break;

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

@@ -48,7 +48,7 @@ public void process(CompoundContext context, nfs_resop4 result) throws ChimeraNF
 
         String name = NameFilter.convertName(_args.oplookup.objname.value);
 
-        Stat.Type statType = context.getFs().getStatType(context.currentInode());
+        Stat.Type statType = context.getFs().getattr(context.currentInode(), Stat.STAT_ATTRIBUTES_TYPE_ONLY).type();
         if (statType == Stat.Type.SYMLINK) {
             throw new SymlinkException("parent not a symbolic link");
         }

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

@@ -46,7 +46,7 @@ public OperationLOOKUPP(nfs_argop4 args) {
     public void process(CompoundContext context, nfs_resop4 result) throws ChimeraNFSException, IOException {
         final LOOKUPP4res res = result.oplookupp;
 
-        Stat.Type statType = context.getFs().getStatType(context.currentInode());
+        Stat.Type statType = context.getFs().getattr(context.currentInode(), Stat.STAT_ATTRIBUTES_TYPE_ONLY).type();
 
         if (statType == Stat.Type.SYMLINK) {
             throw new SymlinkException("get parent on a symlink");

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

@@ -316,7 +316,7 @@ private void checkCanAccess(CompoundContext context, Inode inode, uint32_t share
             throw new AccessException();
         }
 
-        Stat.Type statType = context.getFs().getStatType(inode);
+        Stat.Type statType = context.getFs().getattr(inode, Stat.STAT_ATTRIBUTES_TYPE_ONLY).type();
         switch (statType) {
             case REGULAR:
                 // OK

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

@@ -31,7 +31,6 @@
 import org.dcache.nfs.v4.xdr.nfs_opnum4;
 import org.dcache.nfs.v4.xdr.nfs_resop4;
 import org.dcache.nfs.v4.xdr.stateid4;
-import org.dcache.nfs.vfs.Inode;
 import org.dcache.nfs.vfs.Stat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -53,7 +52,7 @@ public void process(CompoundContext context, nfs_resop4 result) throws IOExcepti
             throw new NotSuppException("operation OPEN_CONFIRM4 is obsolete in 4.x, x > 0");
         }
 
-        Stat.Type statType = context.getFs().getStatType(context.currentInode());
+        Stat.Type statType = context.getFs().getattr(context.currentInode(), Stat.STAT_ATTRIBUTES_TYPE_ONLY).type();
 
         if (statType == Stat.Type.DIRECTORY) {
             throw new IsDirException();

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

@@ -94,7 +94,7 @@ public void process(final CompoundContext context, nfs_resop4 result) throws Chi
             throw new BadCookieException("bad cookie : " + startValue);
         }
 
-        Stat.Type statType = context.getFs().getStatType(dir);
+        Stat.Type statType = context.getFs().getattr(dir, Stat.STAT_ATTRIBUTES_TYPE_ONLY).type();
         if (statType != Stat.Type.DIRECTORY) {
             throw new NotDirException();
         }

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

@@ -47,7 +47,7 @@ public OperationREADLINK(nfs_argop4 args) {
     public void process(CompoundContext context, nfs_resop4 result) throws ChimeraNFSException, IOException {
         final READLINK4res res = result.opreadlink;
 
-        Stat.Type statType = context.getFs().getStatType(context.currentInode());
+        Stat.Type statType = context.getFs().getattr(context.currentInode(), Stat.STAT_ATTRIBUTES_TYPE_ONLY).type();
         if (statType != Stat.Type.SYMLINK) {
             throw new InvalException("not a symlink");
         }

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

@@ -48,7 +48,7 @@ public void process(CompoundContext context, nfs_resop4 result) throws IOExcepti
 
         final SECINFO4res res = result.opsecinfo;
         Inode dir = context.currentInode();
-        Stat.Type statType = context.getFs().getStatType(dir);
+        Stat.Type statType = context.getFs().getattr(dir, Stat.STAT_ATTRIBUTES_TYPE_ONLY).type();
         if (statType != Stat.Type.DIRECTORY) {
             throw new NotDirException();
         }