X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=nfs3%2Fnfs3.c;h=918da6345ff8702628ecc0e69dcb931155ea504f;hb=3f38239ab60c62ba020c85b92b7535b2e90776a7;hp=b4791070606e73647b514bf12aa7255ace1aa99e;hpb=cf3d405919942d3adf810bba0ed5df28a91b6d2d;p=bluesky.git diff --git a/nfs3/nfs3.c b/nfs3/nfs3.c index b479107..918da63 100644 --- a/nfs3/nfs3.c +++ b/nfs3/nfs3.c @@ -208,6 +208,8 @@ void nfsproc3_setattr_3_svc(setattr3args *argp, RPCRequest *req) inode); result.status = NFS3_OK; + bluesky_inode_do_sync(inode); + g_mutex_unlock(inode->lock); async_rpc_send_reply(req, &result); } @@ -328,6 +330,8 @@ void nfsproc3_read_3_svc(read3args *argp, RPCRequest *req) memset(&result, 0, sizeof(result)); char buf[NFS_MAXSIZE]; + bluesky_flushd_invoke_conditional(fs); + BlueSkyInode *inode = lookup_fh(req, &argp->file); if (inode == NULL) { result.status = NFS3ERR_STALE; @@ -372,6 +376,8 @@ void nfsproc3_write_3_svc(write3args *argp, RPCRequest *req) 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; @@ -380,6 +386,7 @@ void nfsproc3_write_3_svc(write3args *argp, RPCRequest *req) 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 @@ -392,6 +399,7 @@ void nfsproc3_write_3_svc(write3args *argp, RPCRequest *req) delay.tv_nsec = 0; nanosleep(&delay, NULL); } +#endif g_mutex_lock(inode->lock); @@ -420,7 +428,14 @@ void nfsproc3_write_3_svc(write3args *argp, RPCRequest *req) encode_fattr3(&wcc.after.post_op_attr_u.attributes, inode); result.write3res_u.resok.file_wcc = wcc; result.write3res_u.resok.count = argp->count; - result.write3res_u.resok.committed = FILE_SYNC; + result.write3res_u.resok.committed = UNSTABLE; + memcpy(result.write3res_u.resok.verf, + nfsd_instance_verf_cookie, NFS3_WRITEVERFSIZE); + + if (argp->stable != UNSTABLE) { + bluesky_inode_do_sync(inode); + result.write3res_u.resok.committed = FILE_SYNC; + } g_mutex_unlock(inode->lock); @@ -464,21 +479,23 @@ void nfsproc3_create_3_svc(create3args *argp, RPCRequest *req) 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); bluesky_inode_update_ctime(dir, TRUE); + bluesky_inode_update_ctime(file, FALSE); wcc.after.present = TRUE; encode_fattr3(&wcc.after.post_op_attr_u.attributes, dir); @@ -492,6 +509,8 @@ void nfsproc3_create_3_svc(create3args *argp, RPCRequest *req) 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; + bluesky_inode_do_sync(file); + bluesky_inode_do_sync(dir); g_mutex_unlock(file->lock); g_mutex_unlock(dir->lock); @@ -535,6 +554,7 @@ void nfsproc3_mkdir_3_svc(mkdir3args *argp, RPCRequest *req) return; } + g_mutex_lock(fs->lock); BlueSkyInode *file; file = bluesky_new_inode(bluesky_fs_alloc_inode(fs), fs, BLUESKY_DIRECTORY); file->nlink = 1; @@ -546,10 +566,12 @@ void nfsproc3_mkdir_3_svc(mkdir3args *argp, RPCRequest *req) 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); bluesky_inode_update_ctime(dir, TRUE); + bluesky_inode_update_ctime(file, FALSE); wcc.after.present = TRUE; encode_fattr3(&wcc.after.post_op_attr_u.attributes, dir); @@ -563,6 +585,8 @@ void nfsproc3_mkdir_3_svc(mkdir3args *argp, RPCRequest *req) 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; + bluesky_inode_do_sync(file); + bluesky_inode_do_sync(dir); g_mutex_unlock(file->lock); g_mutex_unlock(dir->lock); async_rpc_send_reply(req, &result); @@ -604,6 +628,7 @@ void nfsproc3_symlink_3_svc(symlink3args *argp, RPCRequest *req) return; } + g_mutex_lock(fs->lock); BlueSkyInode *file; file = bluesky_new_inode(bluesky_fs_alloc_inode(fs), fs, BLUESKY_SYMLINK); file->nlink = 1; @@ -616,9 +641,11 @@ void nfsproc3_symlink_3_svc(symlink3args *argp, RPCRequest *req) 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); bluesky_inode_update_ctime(dir, TRUE); + bluesky_inode_update_ctime(file, FALSE); wcc.after.present = TRUE; encode_fattr3(&wcc.after.post_op_attr_u.attributes, dir); @@ -632,6 +659,8 @@ void nfsproc3_symlink_3_svc(symlink3args *argp, RPCRequest *req) 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; + bluesky_inode_do_sync(file); + bluesky_inode_do_sync(dir); g_mutex_unlock(file->lock); g_mutex_unlock(dir->lock); async_rpc_send_reply(req, &result); @@ -682,6 +711,7 @@ void nfsproc3_remove_3_svc(diropargs3 *argp, RPCRequest *req) encode_fattr3(&result.wccstat3_u.wcc.after.post_op_attr_u.attributes, dir); + bluesky_inode_do_sync(dir); g_mutex_unlock(dir->lock); async_rpc_send_reply(req, &result); } @@ -749,6 +779,8 @@ void nfsproc3_rmdir_3_svc(diropargs3 *argp, RPCRequest *req) encode_fattr3(&result.wccstat3_u.wcc.after.post_op_attr_u.attributes, dir); + bluesky_inode_do_sync(dir); + bluesky_inode_do_sync(inode); g_mutex_unlock(inode->lock); g_mutex_unlock(dir->lock); async_rpc_send_reply(req, &result); @@ -798,6 +830,9 @@ void nfsproc3_rename_3_svc(rename3args *argp, RPCRequest *req) else result.status = NFS3ERR_PERM; + bluesky_inode_do_sync(dir2); + bluesky_inode_do_sync(dir1); + g_mutex_unlock(dir1->lock); if (dir1->inum != dir2->inum) g_mutex_unlock(dir2->lock); @@ -872,6 +907,8 @@ void nfsproc3_link_3_svc(link3args *argp, RPCRequest *req) encode_fattr3(&result.link3res_u.res.file_attributes.post_op_attr_u.attributes, inode); result.link3res_u.res.linkdir_wcc = wcc; + bluesky_inode_do_sync(inode); + bluesky_inode_do_sync(dir); g_mutex_unlock(inode->lock); g_mutex_unlock(dir->lock); async_rpc_send_reply(req, &result); @@ -975,9 +1012,7 @@ void nfsproc3_readdirplus_3_svc(readdirplus3args *argp, RPCRequest *req) && 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); + bluesky_inode_prefetch(fs, d->inum); dircount += 24 + ((strlen(d->name) + 3) & ~3); attrcount += 88 + 8 + 8; i = g_sequence_iter_next(i); @@ -990,8 +1025,8 @@ void nfsproc3_readdirplus_3_svc(readdirplus3args *argp, RPCRequest *req) 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); - g_mutex_lock(inode->lock); if (inode != NULL) { + g_mutex_lock(inode->lock); dircount += 24 + ((strlen(d->name) + 3) & ~3); attrcount += 88 + 8 + 8; if (dircount > argp->dircount @@ -1128,10 +1163,12 @@ void nfsproc3_commit_3_svc(commit3args *argp, RPCRequest *req) g_mutex_lock(inode->lock); encode_pre_wcc(&result.commit3res_u.resok.file_wcc, inode); - //bluesky_inode_do_sync(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); + memcpy(result.commit3res_u.resok.verf, + nfsd_instance_verf_cookie, NFS3_WRITEVERFSIZE); g_mutex_unlock(inode->lock);