Commit 98a1a6f4 authored by Tigran Mkrtchyan's avatar Tigran Mkrtchyan
Browse files

nfs: clean leftovers from jul to slf4j migration

parent 2f5e76f8
......@@ -140,8 +140,7 @@ public class OperationGETATTR extends AbstractNFSv4Operation {
int[] mask = new int[bitmap.value.length];
for( int i = 0; i < mask.length; i++) {
mask[i] = bitmap.value[i].value;
_log.debug("getAttributes[{}]: {}",
new Object[] { i, Integer.toBinaryString(mask[i])} );
_log.debug("getAttributes[{}]: {}", i, Integer.toBinaryString(mask[i]) );
}
int[] retMask = new int[mask.length];
......@@ -157,14 +156,12 @@ public class OperationGETATTR extends AbstractNFSv4Operation {
if( (newmask & 1) > 0 ) {
XdrAble attrXdr = fattr2xdr(i, fs, inode, context);
if( attrXdr != null) {
_log.debug(" getAttributes : {} ({}) OK.",
new Object[] { i, attrMask2String(i)} );
_log.debug(" getAttributes : {} ({}) OK.", i, attrMask2String(i) );
attrXdr.xdrEncode(xdr);
int attrmask = 1 << (i-(32*(i/32)));
retMask[i/32] |= attrmask;
}else{
_log.debug(" getAttributes : {} ({}) NOT SUPPORTED.",
new Object[] { i, attrMask2String(i)} );
_log.debug(" getAttributes : {} ({}) NOT SUPPORTED.", i, attrMask2String(i) );
}
}
......@@ -181,8 +178,7 @@ public class OperationGETATTR extends AbstractNFSv4Operation {
attributes.attrmask.value = new uint32_t[retMask.length];
for( int i = 0; i < retMask.length; i++) {
attributes.attrmask.value[i] = new uint32_t(retMask[i]);
_log.debug("getAttributes[{}] reply : {}",
new Object[] { i, Integer.toBinaryString(retMask[i])} );
_log.debug("getAttributes[{}] reply : {}", i, Integer.toBinaryString(retMask[i]) );
}
attributes.attr_vals = new attrlist4(retBytes);
......@@ -753,7 +749,7 @@ public class OperationGETATTR extends AbstractNFSv4Operation {
ret = nfs_ftype4.NF4FIFO;
break;
default:
_log.info("Unknown mode [" + Integer.toOctalString(type) +"]");
_log.info("Unknown mode [{}]", Integer.toOctalString(type));
ret = 0;
}
......
......@@ -71,11 +71,9 @@ public class OperationGETDEVICELIST extends AbstractNFSv4Operation {
res.gdlr_resok4.gdlr_deviceid_list[i] = deviceId;
}
if (_log.isDebugEnabled()) {
_log.debug("GETDEVICELIST4: new list of #{}, maxcount {}",
new Object[] {res.gdlr_resok4.gdlr_deviceid_list.length,
_args.opgetdevicelist.gdla_maxdevices.value.value});
}
res.gdlr_resok4.gdlr_deviceid_list.length,
_args.opgetdevicelist.gdla_maxdevices.value.value);
/* we reply only one dummy entry. The rest is dynamic */
res.gdlr_resok4.gdlr_eof = true;
......
......@@ -73,7 +73,7 @@ public class OperationOPEN extends AbstractNFSv4Operation {
client.updateLeaseTime(NFSv4Defaults.NFS4_LEASE_TIME);
_log.debug("open request form clientid: {}, owner: {}",
new Object[]{client, new String(_args.opopen.owner.value.owner)});
client, new String(_args.opopen.owner.value.owner));
}
res.resok4 = new OPEN4resok();
......
......@@ -70,9 +70,7 @@ public class OperationREMOVE extends AbstractNFSv4Operation {
throw new ChimeraNFSException(nfsstat4.NFS4ERR_BADNAME, "bad name '.' or '..'");
}
_log.debug("REMOVE: {} : {}",
new Object[] {parentInode.toString(), name}
);
_log.debug("REMOVE: {} : {}", parentInode.toString(), name);
Stat inodeStat = context.getFs().inodeOf(context.currentInode(), name).statCache();
......
......@@ -98,9 +98,7 @@ public class OperationSETATTR extends AbstractNFSv4Operation {
int[] mask = new int[attributes.attrmask.value.length];
for( int i = 0; i < mask.length; i++) {
mask[i] = attributes.attrmask.value[i].value;
_log.debug("setAttributes[{}]: {}",
new Object[] {i, Integer.toBinaryString(mask[i])}
);
_log.debug("setAttributes[{}]: {}", i, Integer.toBinaryString(mask[i]));
}
XdrDecodingStream xdr = new XdrBuffer( ByteBuffer.wrap(attributes.attr_vals.value));
......@@ -114,15 +112,11 @@ public class OperationSETATTR extends AbstractNFSv4Operation {
int newmask = (mask[i/32] >> (i-(32*(i/32))) );
if( (newmask & 1L) != 0 ) {
if( xdr2fattr(i, inode, context, xdr) ) {
_log.debug(" setAttributes : {} ({}) OK",
new Object[] {i, OperationGETATTR.attrMask2String(i)}
);
_log.debug(" setAttributes : {} ({}) OK", i, OperationGETATTR.attrMask2String(i));
int attrmask = 1 << (i-(32*(i/32)));
retMask[i/32] |= attrmask;
}else{
_log.debug(" setAttributes : {} ({}) NOT SUPPORTED",
new Object[] {i, OperationGETATTR.attrMask2String(i)}
);
_log.debug(" setAttributes : {} ({}) NOT SUPPORTED", i, OperationGETATTR.attrMask2String(i));
throw new ChimeraNFSException( nfsstat4.NFS4ERR_ATTRNOTSUPP, "attribute "+ OperationGETATTR.attrMask2String(i) +" not supported");
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment