Merge remote branch 'origin/master' into svm

This commit is contained in:
Stefan Lankes 2011-11-07 11:30:31 -08:00
commit 1f998714e5

View file

@ -40,10 +40,8 @@ ssize_t read_fs(fildes_t* file, uint8_t* buffer, size_t size)
if (node->read != 0)
ret = node->read(file, buffer, size);
spinlock_unlock(&node->lock);
} else {
if (node->read != 0)
} else if (node->read != 0)
ret = node->read(file, buffer, size);
}
return ret;
}
@ -62,10 +60,8 @@ ssize_t write_fs(fildes_t* file, uint8_t* buffer, size_t size)
if (node->write != 0)
ret = node->write(file, buffer, size);
spinlock_unlock(&node->lock);
} else {
if (node->write != 0)
} else if (node->write != 0)
ret = node->write(file, buffer, size);
}
return ret;
}