extern BlueSkyFS *fs;
+#define NFS_BLOCKSIZE 32768
+#define NFS_MAXSIZE (1 << 20)
+
/* Check that a string is a valid file name. We require that it be valid
* UTF-8, that it not be empty, and that it not contain embedded forward
* slashes. Also checks that the length of the string is not more than the
break;
}
- inode->ctime = now;
- inode->change_count++;
+ bluesky_inode_update_ctime(inode, FALSE);
}
/* Copy inode attributes into NFS response. The BlueSkyInode should be locked
BlueSkyInode *inode = lookup_fh(req, argp);
if (inode != NULL) {
result.status = NFS3_OK;
+ g_mutex_lock(inode->lock);
encode_fattr3(&result.getattr3res_u.attributes, inode);
+ g_mutex_unlock(inode->lock);
} else {
result.status = NFS3ERR_STALE;
}
return;
}
+ g_mutex_lock(inode->lock);
encode_pre_wcc(&result.wccstat3_u.wcc, inode);
if (argp->guard.check) {
if (inode->ctime != decode_nfstime3(&argp->guard.sattrguard3_u.ctime)) {
result.status = NFS3ERR_NOT_SYNC;
result.wccstat3_u.wcc.after.present = TRUE;
encode_fattr3(&result.wccstat3_u.wcc.after.post_op_attr_u.attributes, inode);
+ g_mutex_unlock(inode->lock);
async_rpc_send_reply(req, &result);
return;
}
inode);
result.status = NFS3_OK;
+ g_mutex_unlock(inode->lock);
async_rpc_send_reply(req, &result);
}
return;
}
+ g_mutex_lock(dir->lock);
result.lookup3res_u.resfail.present = TRUE;
encode_fattr3(&result.lookup3res_u.resfail.post_op_attr_u.attributes, dir);
if (!validate_filename(argp->name)) {
result.status = NFS3ERR_NAMETOOLONG;
else
result.status = NFS3ERR_NOENT;
+ g_mutex_unlock(dir->lock);
async_rpc_send_reply(req, &result);
return;
}
uint64_t inum = bluesky_directory_lookup(dir, argp->name);
if (inum == 0) {
result.status = NFS3ERR_NOENT;
+ g_mutex_unlock(dir->lock);
async_rpc_send_reply(req, &result);
return;
}
+
+ result.lookup3res_u.resok.dir_attributes.present = TRUE;
+ encode_fattr3(&result.lookup3res_u.resok.dir_attributes.post_op_attr_u.attributes, dir);
+ g_mutex_unlock(dir->lock);
+
BlueSkyInode *inode = bluesky_get_inode(fs, inum);
if (inode == NULL) {
result.status = NFS3ERR_NOENT;
async_rpc_send_reply(req, &result);
return;
}
+ g_mutex_lock(inode->lock);
schedule_inode_unref(req, inode);
result.status = NFS3_OK;
- result.lookup3res_u.resok.dir_attributes.present = TRUE;
- encode_fattr3(&result.lookup3res_u.resok.dir_attributes.post_op_attr_u.attributes, dir);
result.lookup3res_u.resok.obj_attributes.present = TRUE;
encode_fattr3(&result.lookup3res_u.resok.obj_attributes.post_op_attr_u.attributes, inode);
result.lookup3res_u.resok.object.data.data_len = 8;
result.lookup3res_u.resok.object.data.data_val = (char *)&fh_bytes;
+ g_mutex_unlock(inode->lock);
async_rpc_send_reply(req, &result);
}
return;
}
+ g_mutex_lock(inode->lock);
result.status = NFS3_OK;
result.access3res_u.resok.obj_attributes.present = TRUE;
encode_fattr3(&result.access3res_u.resok.obj_attributes.post_op_attr_u.attributes, inode);
result.access3res_u.resok.access = argp->access;
+ g_mutex_unlock(inode->lock);
async_rpc_send_reply(req, &result);
}
BlueSkyInode *inode = lookup_fh(req, argp);
if (inode != NULL) {
+ g_mutex_lock(inode->lock);
if (inode->type == BLUESKY_SYMLINK) {
result.status = NFS3_OK;
result.readlink3res_u.resok.symlink_attributes.present = TRUE;
result.readlink3res_u.resfail.present = TRUE;
encode_fattr3(&result.readlink3res_u.resfail.post_op_attr_u.attributes, inode);
}
+ g_mutex_unlock(inode->lock);
} else {
result.status = NFS3ERR_STALE;
}
{
read3res result;
memset(&result, 0, sizeof(result));
- char buf[32768];
+ char buf[NFS_MAXSIZE];
+
+ bluesky_flushd_invoke_conditional(fs);
BlueSkyInode *inode = lookup_fh(req, &argp->file);
if (inode == NULL) {
return;
}
+ g_mutex_lock(inode->lock);
+
int count = argp->count;
if (argp->offset >= inode->size) {
count = 0;
result.read3res_u.resok.eof = TRUE;
} else {
+ count = MIN(count, NFS_MAXSIZE);
count = MIN(count, inode->size - argp->offset);
if (argp->offset + count == inode->size)
result.read3res_u.resok.eof = TRUE;
result.read3res_u.resok.data.data_val = buf;
result.read3res_u.resok.data.data_len = count;
+ g_mutex_unlock(inode->lock);
+
async_rpc_send_reply(req, &result);
}
struct wcc_data wcc;
memset(&wcc, 0, sizeof(wcc));
+ bluesky_flushd_invoke_conditional(fs);
+
BlueSkyInode *inode = lookup_fh(req, &argp->file);
if (inode == NULL) {
result.status = NFS3ERR_STALE;
return;
}
+#if 0
+ /* FIXME: Hack to throttle writes when there is too much dirty data still
+ * to be written out. */
+ while (g_atomic_int_get(&fs->cache_dirty) > 4096
+ || g_atomic_int_get(&fs->cache_total) > 8192) {
+ g_print("Too many dirty pages (%d) or total pages (%d); throttling writes...\n",
+ g_atomic_int_get(&fs->cache_dirty),
+ g_atomic_int_get(&fs->cache_total));
+ struct timespec delay;
+ delay.tv_sec = 2;
+ delay.tv_nsec = 0;
+ nanosleep(&delay, NULL);
+ }
+#endif
+
+ g_mutex_lock(inode->lock);
+
encode_pre_wcc(&wcc, inode);
if (inode->type != BLUESKY_REGULAR) {
result.status = NFS3ERR_INVAL;
result.write3res_u.resfail = wcc;
+ g_mutex_unlock(inode->lock);
async_rpc_send_reply(req, &result);
return;
}
result.write3res_u.resok.count = argp->count;
result.write3res_u.resok.committed = FILE_SYNC;
+ g_mutex_unlock(inode->lock);
+
async_rpc_send_reply(req, &result);
}
return;
}
+ g_mutex_lock(dir->lock);
+
encode_pre_wcc(&wcc, dir);
if (dir->type != BLUESKY_DIRECTORY) {
result.status = NFS3ERR_NOTDIR;
result.diropres3_u.resfail = wcc;
+ g_mutex_unlock(dir->lock);
async_rpc_send_reply(req, &result);
return;
}
{
result.status = NFS3ERR_EXIST;
result.diropres3_u.resfail = wcc;
+ g_mutex_unlock(dir->lock);
async_rpc_send_reply(req, &result);
return;
}
+ g_mutex_lock(fs->lock);
BlueSkyInode *file;
file = bluesky_new_inode(bluesky_fs_alloc_inode(fs), fs, BLUESKY_REGULAR);
file->nlink = 1;
file->mode = 0755;
int64_t time = bluesky_get_current_time();
- printf("time: %"PRIi64"\n", time);
file->mtime = time;
file->ctime = time;
file->atime = time;
file->ntime = time;
+ g_mutex_lock(file->lock);
bluesky_insert_inode(fs, file);
+ g_mutex_unlock(fs->lock);
bluesky_directory_insert(dir, argp->where.name, file->inum);
- dir->mtime = dir->ctime = bluesky_get_current_time();
- dir->change_count++;
+ bluesky_inode_update_ctime(dir, TRUE);
wcc.after.present = TRUE;
encode_fattr3(&wcc.after.post_op_attr_u.attributes, dir);
result.diropres3_u.resok.obj.post_op_fh3_u.handle.data.data_len = 8;
result.diropres3_u.resok.obj.post_op_fh3_u.handle.data.data_val = (char *)&fh_bytes;
+ g_mutex_unlock(file->lock);
+ g_mutex_unlock(dir->lock);
+
async_rpc_send_reply(req, &result);
}
return;
}
+ g_mutex_lock(dir->lock);
+
encode_pre_wcc(&wcc, dir);
if (dir->type != BLUESKY_DIRECTORY) {
result.status = NFS3ERR_NOTDIR;
result.diropres3_u.resfail = wcc;
+ g_mutex_unlock(dir->lock);
async_rpc_send_reply(req, &result);
return;
}
{
result.status = NFS3ERR_EXIST;
result.diropres3_u.resfail = wcc;
+ g_mutex_unlock(dir->lock);
async_rpc_send_reply(req, &result);
return;
}
+ g_mutex_lock(fs->lock);
BlueSkyInode *file;
file = bluesky_new_inode(bluesky_fs_alloc_inode(fs), fs, BLUESKY_DIRECTORY);
file->nlink = 1;
file->ctime = time;
file->atime = time;
file->ntime = time;
+ g_mutex_lock(file->lock);
bluesky_insert_inode(fs, file);
+ g_mutex_unlock(fs->lock);
bluesky_directory_insert(dir, argp->where.name, file->inum);
set_attributes(file, &argp->attributes);
- dir->mtime = dir->ctime = bluesky_get_current_time();
- dir->change_count++;
+ bluesky_inode_update_ctime(dir, TRUE);
wcc.after.present = TRUE;
encode_fattr3(&wcc.after.post_op_attr_u.attributes, dir);
result.diropres3_u.resok.obj.post_op_fh3_u.handle.data.data_len = 8;
result.diropres3_u.resok.obj.post_op_fh3_u.handle.data.data_val = (char *)&fh_bytes;
+ g_mutex_unlock(file->lock);
+ g_mutex_unlock(dir->lock);
async_rpc_send_reply(req, &result);
}
async_rpc_send_reply(req, &result);
return;
}
+ g_mutex_lock(dir->lock);
encode_pre_wcc(&wcc, dir);
if (dir->type != BLUESKY_DIRECTORY) {
result.status = NFS3ERR_NOTDIR;
result.diropres3_u.resfail = wcc;
+ g_mutex_unlock(dir->lock);
async_rpc_send_reply(req, &result);
return;
}
{
result.status = NFS3ERR_EXIST;
result.diropres3_u.resfail = wcc;
+ g_mutex_unlock(dir->lock);
async_rpc_send_reply(req, &result);
return;
}
+ g_mutex_lock(fs->lock);
BlueSkyInode *file;
file = bluesky_new_inode(bluesky_fs_alloc_inode(fs), fs, BLUESKY_SYMLINK);
file->nlink = 1;
file->atime = time;
file->ntime = time;
file->symlink_contents = g_strdup(argp->symlink.symlink_data);
+ g_mutex_lock(file->lock);
bluesky_insert_inode(fs, file);
+ g_mutex_unlock(fs->lock);
bluesky_directory_insert(dir, argp->where.name, file->inum);
- dir->mtime = dir->ctime = bluesky_get_current_time();
- dir->change_count++;
+ bluesky_inode_update_ctime(dir, TRUE);
wcc.after.present = TRUE;
encode_fattr3(&wcc.after.post_op_attr_u.attributes, dir);
result.diropres3_u.resok.obj.post_op_fh3_u.handle.data.data_len = 8;
result.diropres3_u.resok.obj.post_op_fh3_u.handle.data.data_val = (char *)&fh_bytes;
+ g_mutex_unlock(file->lock);
+ g_mutex_unlock(dir->lock);
async_rpc_send_reply(req, &result);
}
return;
}
+ g_mutex_lock(dir->lock);
+
encode_pre_wcc(&result.wccstat3_u.wcc, dir);
if (!validate_filename(argp->name)
|| strcmp(argp->name, "..") == 0)
{
result.status = NFS3ERR_NOENT;
+ g_mutex_unlock(dir->lock);
async_rpc_send_reply(req, &result);
return;
}
encode_fattr3(&result.wccstat3_u.wcc.after.post_op_attr_u.attributes,
dir);
+ g_mutex_unlock(dir->lock);
async_rpc_send_reply(req, &result);
}
return;
}
+ g_mutex_lock(dir->lock);
+
encode_pre_wcc(&result.wccstat3_u.wcc, dir);
if (!validate_filename(argp->name)
|| strcmp(argp->name, "..") == 0)
{
result.status = NFS3ERR_NOENT;
+ g_mutex_unlock(dir->lock);
async_rpc_send_reply(req, &result);
return;
}
BlueSkyInode *inode = bluesky_get_inode(fs, inum);
if (inode == NULL) {
result.status = NFS3ERR_NOENT;
+ g_mutex_unlock(dir->lock);
async_rpc_send_reply(req, &result);
return;
}
+ g_mutex_lock(inode->lock);
schedule_inode_unref(req, inode);
if (inode->type != BLUESKY_DIRECTORY) {
result.status = NFS3ERR_NOTDIR;
+ g_mutex_unlock(inode->lock);
+ g_mutex_unlock(dir->lock);
async_rpc_send_reply(req, &result);
return;
}
printf("Directory not empty: %d entries\n",
g_sequence_get_length(inode->dirents));
result.status = NFS3ERR_NOTEMPTY;
+ g_mutex_unlock(inode->lock);
+ g_mutex_unlock(dir->lock);
async_rpc_send_reply(req, &result);
return;
}
encode_fattr3(&result.wccstat3_u.wcc.after.post_op_attr_u.attributes,
dir);
+ g_mutex_unlock(inode->lock);
+ g_mutex_unlock(dir->lock);
async_rpc_send_reply(req, &result);
}
async_rpc_send_reply(req, &result);
return;
}
- encode_pre_wcc(wcc1, dir1);
BlueSkyInode *dir2 = lookup_fh(req, &argp->to.dir);
if (dir2 == NULL) {
async_rpc_send_reply(req, &result);
return;
}
+
+ if (dir1->inum < dir2->inum) {
+ g_mutex_lock(dir1->lock);
+ g_mutex_lock(dir2->lock);
+ } else if (dir1->inum > dir2->inum) {
+ g_mutex_lock(dir2->lock);
+ g_mutex_lock(dir1->lock);
+ }
+ encode_pre_wcc(wcc1, dir1);
encode_pre_wcc(wcc2, dir1);
gboolean status = bluesky_rename(dir1, argp->from.name,
else
result.status = NFS3ERR_PERM;
+ g_mutex_unlock(dir1->lock);
+ if (dir1->inum != dir2->inum)
+ g_mutex_unlock(dir2->lock);
async_rpc_send_reply(req, &result);
}
async_rpc_send_reply(req, &result);
return;
}
+ g_mutex_lock(inode->lock);
BlueSkyInode *dir = lookup_fh(req, &argp->link.dir);
if (dir == NULL) {
result.status = NFS3ERR_STALE;
result.link3res_u.res.linkdir_wcc = wcc;
+ g_mutex_unlock(inode->lock);
async_rpc_send_reply(req, &result);
return;
}
+ g_mutex_lock(dir->lock);
encode_pre_wcc(&wcc, dir);
if (dir->type != BLUESKY_DIRECTORY) {
result.status = NFS3ERR_NOTDIR;
result.link3res_u.res.linkdir_wcc = wcc;
+ g_mutex_unlock(inode->lock);
+ g_mutex_unlock(dir->lock);
async_rpc_send_reply(req, &result);
return;
}
{
result.status = NFS3ERR_EXIST;
result.link3res_u.res.linkdir_wcc = wcc;
+ g_mutex_unlock(inode->lock);
+ g_mutex_unlock(dir->lock);
async_rpc_send_reply(req, &result);
return;
}
if (!bluesky_directory_insert(dir, argp->link.name, inode->inum)) {
result.status = NFS3ERR_EXIST;
result.link3res_u.res.linkdir_wcc = wcc;
+ g_mutex_unlock(inode->lock);
+ g_mutex_unlock(dir->lock);
async_rpc_send_reply(req, &result);
return;
}
inode->nlink++;
- bluesky_inode_update_ctime(inode, 0);
+ bluesky_inode_update_ctime(inode, FALSE);
+ bluesky_inode_update_ctime(dir, TRUE);
result.status = NFS3_OK;
wcc.after.present = TRUE;
encode_fattr3(&result.link3res_u.res.file_attributes.post_op_attr_u.attributes, inode);
result.link3res_u.res.linkdir_wcc = wcc;
+ g_mutex_unlock(inode->lock);
+ g_mutex_unlock(dir->lock);
async_rpc_send_reply(req, &result);
}
async_rpc_send_reply(req, &result);
return;
}
+ g_mutex_lock(dir->lock);
result.status = NFS3_OK;
result.readdir3res_u.resok.dir_attributes.present = TRUE;
result.readdir3res_u.resok.reply.entries = NULL;
result.readdir3res_u.resok.reply.eof = g_sequence_iter_is_end(i);
+ g_mutex_unlock(dir->lock);
async_rpc_send_reply(req, &result);
}
async_rpc_send_reply(req, &result);
return;
}
+ g_mutex_lock(dir->lock);
result.status = NFS3_OK;
result.readdirplus3res_u.resok.dir_attributes.present = TRUE;
uint64_t fh_bytes[MAX_READDIR_DIRENTS];
int count = 0;
- /* TODO: Handle dircount, maxcount arguments from client. */
-
+ GSequenceIter *i;
BlueSkyDirent start = {NULL, NULL, argp->cookie, 0};
- GSequenceIter *i = g_sequence_search(dir->dirents, &start,
- bluesky_dirent_compare, NULL);
+ /* Perform a prefetch pass on inodes: for all the inodes we think we will
+ * return information about, try to load each one but don't wait. This
+ * should let multiple inodes be fetched in parallel, instead of
+ * sequentially in the loop that follows. */
+ i = g_sequence_search(dir->dirents, &start, bluesky_dirent_compare, NULL);
+ while (count < MAX_READDIR_DIRENTS
+ && !g_sequence_iter_is_end(i)
+ && dircount <= argp->dircount
+ && dircount + attrcount <= argp->maxcount)
+ {
+ BlueSkyDirent *d = g_sequence_get(i);
+ BlueSkyInode *inode = bluesky_get_inode(fs, d->inum);
+ if (inode != NULL)
+ bluesky_inode_unref(inode);
+ dircount += 24 + ((strlen(d->name) + 3) & ~3);
+ attrcount += 88 + 8 + 8;
+ i = g_sequence_iter_next(i);
+ }
+
+ i = g_sequence_search(dir->dirents, &start, bluesky_dirent_compare, NULL);
+ count = 0;
+ dircount = 88 + 16;
+ attrcount = 0;
while (count < MAX_READDIR_DIRENTS && !g_sequence_iter_is_end(i)) {
BlueSkyDirent *d = g_sequence_get(i);
BlueSkyInode *inode = bluesky_get_inode(fs, d->inum);
if (inode != NULL) {
+ g_mutex_lock(inode->lock);
dircount += 24 + ((strlen(d->name) + 3) & ~3);
attrcount += 88 + 8 + 8;
if (dircount > argp->dircount
|| dircount + attrcount > argp->maxcount)
+ {
+ g_mutex_unlock(inode->lock);
+ bluesky_inode_unref(inode);
break;
+ }
dirents[count].fileid = d->inum;
dirents[count].name = d->name;
dirents[count].cookie = d->cookie;
if (count > 0)
dirents[count - 1].nextentry = &dirents[count];
count++;
+ g_mutex_unlock(inode->lock);
bluesky_inode_unref(inode);
}
i = g_sequence_iter_next(i);
result.readdirplus3res_u.resok.reply.entries = NULL;
result.readdirplus3res_u.resok.reply.eof = g_sequence_iter_is_end(i);
+ g_mutex_unlock(dir->lock);
async_rpc_send_reply(req, &result);
}
async_rpc_send_reply(req, &result);
return;
}
+ g_mutex_lock(inode->lock);
result.status = NFS3_OK;
result.fsstat3res_u.resok.obj_attributes.present = TRUE;
result.fsstat3res_u.resok.afiles = 0;
result.fsstat3res_u.resok.invarsec = 0;
+ g_mutex_unlock(inode->lock);
async_rpc_send_reply(req, &result);
}
memset(&result, 0, sizeof(result));
BlueSkyInode *inode = bluesky_get_inode(fs, 1);
+ g_mutex_lock(inode->lock);
result.status = NFS3_OK;
result.fsinfo3res_u.resok.obj_attributes.present = TRUE;
encode_fattr3(&result.fsinfo3res_u.resok.obj_attributes.post_op_attr_u.attributes, inode);
- result.fsinfo3res_u.resok.rtmax = 32768;
- result.fsinfo3res_u.resok.rtpref = 32768;
- result.fsinfo3res_u.resok.rtmult = 4096;
- result.fsinfo3res_u.resok.wtmax = 32768;
- result.fsinfo3res_u.resok.wtpref = 32768;
- result.fsinfo3res_u.resok.wtmult = 4096;
- result.fsinfo3res_u.resok.dtpref = 4096;
+ result.fsinfo3res_u.resok.rtmax = NFS_MAXSIZE;
+ result.fsinfo3res_u.resok.rtpref = NFS_MAXSIZE;
+ result.fsinfo3res_u.resok.rtmult = NFS_BLOCKSIZE;
+ result.fsinfo3res_u.resok.wtmax = NFS_MAXSIZE;
+ result.fsinfo3res_u.resok.wtpref = NFS_MAXSIZE;
+ result.fsinfo3res_u.resok.wtmult = NFS_BLOCKSIZE;
+ result.fsinfo3res_u.resok.dtpref = NFS_BLOCKSIZE;
result.fsinfo3res_u.resok.maxfilesize = 0x7fffffffffffffffULL;
result.fsinfo3res_u.resok.time_delta.seconds = 0;
result.fsinfo3res_u.resok.time_delta.nseconds = 1000;
result.fsinfo3res_u.resok.properties
= FSF3_LINK | FSF3_SYMLINK | FSF3_HOMOGENEOUS | FSF3_CANSETTIME;
- bluesky_inode_unref(inode);
+ g_mutex_unlock(inode->lock);
+ bluesky_inode_unref(inode);
async_rpc_send_reply(req, &result);
}
memset(&result, 0, sizeof(result));
BlueSkyInode *inode = bluesky_get_inode(fs, 1);
+ g_mutex_lock(inode->lock);
result.status = NFS3_OK;
result.pathconf3res_u.resok.obj_attributes.present = TRUE;
encode_fattr3(&result.pathconf3res_u.resok.obj_attributes.post_op_attr_u.attributes, inode);
result.pathconf3res_u.resok.chown_restricted = TRUE;
result.pathconf3res_u.resok.case_insensitive = FALSE;
result.pathconf3res_u.resok.case_preserving = TRUE;
- bluesky_inode_unref(inode);
+ g_mutex_unlock(inode->lock);
+ bluesky_inode_unref(inode);
async_rpc_send_reply(req, &result);
}
commit3res result;
memset(&result, 0, sizeof(result));
- result.status = NFS3ERR_NOTSUPP;
+ result.status = NFS3_OK;
+
+ BlueSkyInode *inode = lookup_fh(req, &argp->file);
+ if (inode == NULL) {
+ result.status = NFS3ERR_STALE;
+ async_rpc_send_reply(req, &result);
+ return;
+ }
+
+ g_mutex_lock(inode->lock);
+ encode_pre_wcc(&result.commit3res_u.resok.file_wcc, inode);
+
+ //bluesky_inode_do_sync(inode);
+
+ result.commit3res_u.resok.file_wcc.after.present = TRUE;
+ encode_fattr3(&result.commit3res_u.resok.file_wcc.after.post_op_attr_u.attributes, inode);
+
+ g_mutex_unlock(inode->lock);
async_rpc_send_reply(req, &result);
}