X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=nfs3%2Fnfs3.c;h=ce8c27e8550788cb1047e1b5b0cafe0ab1b14e4f;hb=604e560bdd2475c6e9df1eadd1bf2f85d0b07ef2;hp=0ba7f56a4cb3757504d60e72fb0c04e9959bfef7;hpb=4bef26446b9100f63ac3c953b7f96f1966673980;p=bluesky.git diff --git a/nfs3/nfs3.c b/nfs3/nfs3.c index 0ba7f56..ce8c27e 100644 --- a/nfs3/nfs3.c +++ b/nfs3/nfs3.c @@ -139,14 +139,12 @@ void encode_pre_wcc(struct wcc_data *wcc, BlueSkyInode *inode) wcc->before.pre_op_attr_u.attributes.ctime.nseconds = (inode->ctime % 1000000) * 1000; } -void * -nfsproc3_null_3_svc(void *argp, struct svc_req *rqstp) +void nfsproc3_null_3_svc(void *argp, RPCRequest *req) { - return null_result; + async_rpc_send_reply(req, null_result); } -getattr3res * -nfsproc3_getattr_3_svc(nfs_fh3 *argp, struct svc_req *rqstp) +void nfsproc3_getattr_3_svc(nfs_fh3 *argp, RPCRequest *req) { static getattr3res result; @@ -158,11 +156,10 @@ nfsproc3_getattr_3_svc(nfs_fh3 *argp, struct svc_req *rqstp) result.status = NFS3ERR_STALE; } - return &result; + async_rpc_send_reply(req, &result); } -wccstat3 * -nfsproc3_setattr_3_svc(setattr3args *argp, struct svc_req *rqstp) +void nfsproc3_setattr_3_svc(setattr3args *argp, RPCRequest *req) { static wccstat3 result; @@ -171,7 +168,8 @@ nfsproc3_setattr_3_svc(setattr3args *argp, struct svc_req *rqstp) BlueSkyInode *inode = lookup_fh(&argp->object); if (inode == NULL) { result.status = NFS3ERR_STALE; - return &result; + async_rpc_send_reply(req, &result); + return; } encode_pre_wcc(&result.wccstat3_u.wcc, inode); @@ -180,7 +178,8 @@ nfsproc3_setattr_3_svc(setattr3args *argp, struct svc_req *rqstp) 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); - return &result; + async_rpc_send_reply(req, &result); + return; } } @@ -191,11 +190,10 @@ nfsproc3_setattr_3_svc(setattr3args *argp, struct svc_req *rqstp) inode); result.status = NFS3_OK; - return &result; + async_rpc_send_reply(req, &result); } -lookup3res * -nfsproc3_lookup_3_svc(diropargs3 *argp, struct svc_req *rqstp) +void nfsproc3_lookup_3_svc(diropargs3 *argp, RPCRequest *req) { static lookup3res result; @@ -203,7 +201,8 @@ nfsproc3_lookup_3_svc(diropargs3 *argp, struct svc_req *rqstp) if (dir == NULL) { result.status = NFS3ERR_STALE; result.lookup3res_u.resfail.present = FALSE; - return &result; + async_rpc_send_reply(req, &result); + return; } result.lookup3res_u.resfail.present = TRUE; @@ -213,19 +212,22 @@ nfsproc3_lookup_3_svc(diropargs3 *argp, struct svc_req *rqstp) result.status = NFS3ERR_NAMETOOLONG; else result.status = NFS3ERR_NOENT; - return &result; + async_rpc_send_reply(req, &result); + return; } /* TODO: Special-case "." and "..". */ uint64_t inum = bluesky_directory_lookup(dir, argp->name); if (inum == 0) { result.status = NFS3ERR_NOENT; - return &result; + async_rpc_send_reply(req, &result); + return; } BlueSkyInode *inode = bluesky_get_inode(fs, inum); if (inode == NULL) { result.status = NFS3ERR_NOENT; - return &result; + async_rpc_send_reply(req, &result); + return; } result.status = NFS3_OK; @@ -239,11 +241,10 @@ nfsproc3_lookup_3_svc(diropargs3 *argp, struct svc_req *rqstp) result.lookup3res_u.resok.object.data.data_len = 8; result.lookup3res_u.resok.object.data.data_val = (char *)&fh_bytes; - return &result; + async_rpc_send_reply(req, &result); } -access3res * -nfsproc3_access_3_svc(access3args *argp, struct svc_req *rqstp) +void nfsproc3_access_3_svc(access3args *argp, RPCRequest *req) { static access3res result; @@ -251,7 +252,8 @@ nfsproc3_access_3_svc(access3args *argp, struct svc_req *rqstp) if (inode == NULL) { result.status = NFS3ERR_STALE; result.access3res_u.resfail.present = FALSE; - return &result; + async_rpc_send_reply(req, &result); + return; } result.status = NFS3_OK; @@ -259,11 +261,10 @@ nfsproc3_access_3_svc(access3args *argp, struct svc_req *rqstp) encode_fattr3(&result.access3res_u.resok.obj_attributes.post_op_attr_u.attributes, inode); result.access3res_u.resok.access = argp->access; - return &result; + async_rpc_send_reply(req, &result); } -readlink3res * -nfsproc3_readlink_3_svc(nfs_fh3 *argp, struct svc_req *rqstp) +void nfsproc3_readlink_3_svc(nfs_fh3 *argp, RPCRequest *req) { static readlink3res result; memset(&result, 0, sizeof(result)); @@ -284,11 +285,10 @@ nfsproc3_readlink_3_svc(nfs_fh3 *argp, struct svc_req *rqstp) result.status = NFS3ERR_STALE; } - return &result; + async_rpc_send_reply(req, &result); } -read3res * -nfsproc3_read_3_svc(read3args *argp, struct svc_req *rqstp) +void nfsproc3_read_3_svc(read3args *argp, RPCRequest *req) { static read3res result; static char buf[32768]; @@ -297,7 +297,8 @@ nfsproc3_read_3_svc(read3args *argp, struct svc_req *rqstp) if (inode == NULL) { result.status = NFS3ERR_STALE; result.read3res_u.resfail.present = FALSE; - return &result; + async_rpc_send_reply(req, &result); + return; } int count = argp->count; @@ -321,11 +322,10 @@ nfsproc3_read_3_svc(read3args *argp, struct svc_req *rqstp) result.read3res_u.resok.data.data_val = buf; result.read3res_u.resok.data.data_len = count; - return &result; + async_rpc_send_reply(req, &result); } -write3res * -nfsproc3_write_3_svc(write3args *argp, struct svc_req *rqstp) +void nfsproc3_write_3_svc(write3args *argp, RPCRequest *req) { static write3res result; struct wcc_data wcc; @@ -335,14 +335,16 @@ nfsproc3_write_3_svc(write3args *argp, struct svc_req *rqstp) if (inode == NULL) { result.status = NFS3ERR_STALE; result.write3res_u.resfail = wcc; - return &result; + async_rpc_send_reply(req, &result); + return; } encode_pre_wcc(&wcc, inode); if (inode->type != BLUESKY_REGULAR) { result.status = NFS3ERR_INVAL; result.write3res_u.resfail = wcc; - return &result; + async_rpc_send_reply(req, &result); + return; } uint64_t lastbyte = argp->offset + argp->count; @@ -363,11 +365,10 @@ nfsproc3_write_3_svc(write3args *argp, struct svc_req *rqstp) result.write3res_u.resok.count = argp->count; result.write3res_u.resok.committed = FILE_SYNC; - return &result; + async_rpc_send_reply(req, &result); } -diropres3 * -nfsproc3_create_3_svc(create3args *argp, struct svc_req *rqstp) +void nfsproc3_create_3_svc(create3args *argp, RPCRequest *req) { static diropres3 result; struct wcc_data wcc; @@ -377,14 +378,16 @@ nfsproc3_create_3_svc(create3args *argp, struct svc_req *rqstp) if (dir == NULL) { result.status = NFS3ERR_STALE; result.diropres3_u.resfail = wcc; - return &result; + async_rpc_send_reply(req, &result); + return; } encode_pre_wcc(&wcc, dir); if (dir->type != BLUESKY_DIRECTORY) { result.status = NFS3ERR_NOTDIR; result.diropres3_u.resfail = wcc; - return &result; + async_rpc_send_reply(req, &result); + return; } if (!validate_filename(argp->where.name) @@ -393,7 +396,8 @@ nfsproc3_create_3_svc(create3args *argp, struct svc_req *rqstp) { result.status = NFS3ERR_EXIST; result.diropres3_u.resfail = wcc; - return &result; + async_rpc_send_reply(req, &result); + return; } BlueSkyInode *file; @@ -424,11 +428,10 @@ nfsproc3_create_3_svc(create3args *argp, struct svc_req *rqstp) 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; - return &result; + async_rpc_send_reply(req, &result); } -diropres3 * -nfsproc3_mkdir_3_svc(mkdir3args *argp, struct svc_req *rqstp) +void nfsproc3_mkdir_3_svc(mkdir3args *argp, RPCRequest *req) { static diropres3 result; struct wcc_data wcc; @@ -438,14 +441,16 @@ nfsproc3_mkdir_3_svc(mkdir3args *argp, struct svc_req *rqstp) if (dir == NULL) { result.status = NFS3ERR_STALE; result.diropres3_u.resfail = wcc; - return &result; + async_rpc_send_reply(req, &result); + return; } encode_pre_wcc(&wcc, dir); if (dir->type != BLUESKY_DIRECTORY) { result.status = NFS3ERR_NOTDIR; result.diropres3_u.resfail = wcc; - return &result; + async_rpc_send_reply(req, &result); + return; } if (!validate_filename(argp->where.name) @@ -454,7 +459,8 @@ nfsproc3_mkdir_3_svc(mkdir3args *argp, struct svc_req *rqstp) { result.status = NFS3ERR_EXIST; result.diropres3_u.resfail = wcc; - return &result; + async_rpc_send_reply(req, &result); + return; } BlueSkyInode *file; @@ -485,11 +491,10 @@ nfsproc3_mkdir_3_svc(mkdir3args *argp, struct svc_req *rqstp) 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; - return &result; + async_rpc_send_reply(req, &result); } -diropres3 * -nfsproc3_symlink_3_svc(symlink3args *argp, struct svc_req *rqstp) +void nfsproc3_symlink_3_svc(symlink3args *argp, RPCRequest *req) { static diropres3 result; struct wcc_data wcc; @@ -499,14 +504,16 @@ nfsproc3_symlink_3_svc(symlink3args *argp, struct svc_req *rqstp) if (dir == NULL) { result.status = NFS3ERR_STALE; result.diropres3_u.resfail = wcc; - return &result; + async_rpc_send_reply(req, &result); + return; } encode_pre_wcc(&wcc, dir); if (dir->type != BLUESKY_DIRECTORY) { result.status = NFS3ERR_NOTDIR; result.diropres3_u.resfail = wcc; - return &result; + async_rpc_send_reply(req, &result); + return; } if (!validate_filename(argp->where.name) @@ -515,7 +522,8 @@ nfsproc3_symlink_3_svc(symlink3args *argp, struct svc_req *rqstp) { result.status = NFS3ERR_EXIST; result.diropres3_u.resfail = wcc; - return &result; + async_rpc_send_reply(req, &result); + return; } BlueSkyInode *file; @@ -546,21 +554,19 @@ nfsproc3_symlink_3_svc(symlink3args *argp, struct svc_req *rqstp) 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; - return &result; + async_rpc_send_reply(req, &result); } -diropres3 * -nfsproc3_mknod_3_svc(mknod3args *argp, struct svc_req *rqstp) +void nfsproc3_mknod_3_svc(mknod3args *argp, RPCRequest *req) { static diropres3 result; result.status = NFS3ERR_NOTSUPP; - return &result; + async_rpc_send_reply(req, &result); } -wccstat3 * -nfsproc3_remove_3_svc(diropargs3 *argp, struct svc_req *rqstp) +void nfsproc3_remove_3_svc(diropargs3 *argp, RPCRequest *req) { static wccstat3 result; @@ -570,7 +576,8 @@ nfsproc3_remove_3_svc(diropargs3 *argp, struct svc_req *rqstp) BlueSkyInode *dir = lookup_fh(&argp->dir); if (dir == NULL) { result.status = NFS3ERR_STALE; - return &result; + async_rpc_send_reply(req, &result); + return; } encode_pre_wcc(&result.wccstat3_u.wcc, dir); @@ -580,7 +587,8 @@ nfsproc3_remove_3_svc(diropargs3 *argp, struct svc_req *rqstp) || strcmp(argp->name, "..") == 0) { result.status = NFS3ERR_NOENT; - return &result; + async_rpc_send_reply(req, &result); + return; } /* TODO: Decrement link count, deallocate inode if needed. */ @@ -592,21 +600,68 @@ nfsproc3_remove_3_svc(diropargs3 *argp, struct svc_req *rqstp) encode_fattr3(&result.wccstat3_u.wcc.after.post_op_attr_u.attributes, dir); - return &result; + async_rpc_send_reply(req, &result); } -wccstat3 * -nfsproc3_rmdir_3_svc(diropargs3 *argp, struct svc_req *rqstp) +void nfsproc3_rmdir_3_svc(diropargs3 *argp, RPCRequest *req) { static wccstat3 result; - result.status = NFS3ERR_NOTSUPP; + result.wccstat3_u.wcc.before.present = FALSE; + result.wccstat3_u.wcc.after.present = FALSE; + + BlueSkyInode *dir = lookup_fh(&argp->dir); + if (dir == NULL) { + result.status = NFS3ERR_STALE; + async_rpc_send_reply(req, &result); + return; + } + + encode_pre_wcc(&result.wccstat3_u.wcc, dir); + + if (!validate_filename(argp->name) + || strcmp(argp->name, ".") == 0 + || strcmp(argp->name, "..") == 0) + { + result.status = NFS3ERR_NOENT; + async_rpc_send_reply(req, &result); + return; + } + + uint64_t inum = bluesky_directory_lookup(dir, argp->name); + BlueSkyInode *inode = bluesky_get_inode(fs, inum); + if (inode == NULL) { + result.status = NFS3ERR_NOENT; + async_rpc_send_reply(req, &result); + return; + } + + if (inode->type != BLUESKY_DIRECTORY) { + result.status = NFS3ERR_NOTDIR; + async_rpc_send_reply(req, &result); + return; + } + if (g_sequence_get_length(inode->dirents) > 0) { + printf("Directory not empty: %d entries\n", + g_sequence_get_length(inode->dirents)); + result.status = NFS3ERR_NOTEMPTY; + async_rpc_send_reply(req, &result); + return; + } - return &result; + /* TODO: Decrement link count, deallocate inode if needed. */ + + bluesky_directory_remove(dir, argp->name); + + result.status = NFS3_OK; + result.wccstat3_u.wcc.after.present = TRUE; + encode_fattr3(&result.wccstat3_u.wcc.after.post_op_attr_u.attributes, + dir); + + async_rpc_send_reply(req, &result); } -rename3res * -nfsproc3_rename_3_svc(rename3args *argp, struct svc_req *rqstp) +void nfsproc3_rename_3_svc(rename3args *argp, RPCRequest *req) { static rename3res result; wcc_data *wcc1 = &result.rename3res_u.res.fromdir_wcc; @@ -617,14 +672,16 @@ nfsproc3_rename_3_svc(rename3args *argp, struct svc_req *rqstp) BlueSkyInode *dir1 = lookup_fh(&argp->from.dir); if (dir1 == NULL) { result.status = NFS3ERR_STALE; - return &result; + async_rpc_send_reply(req, &result); + return; } encode_pre_wcc(wcc1, dir1); BlueSkyInode *dir2 = lookup_fh(&argp->to.dir); if (dir2 == NULL) { result.status = NFS3ERR_STALE; - return &result; + async_rpc_send_reply(req, &result); + return; } encode_pre_wcc(wcc2, dir1); @@ -641,11 +698,10 @@ nfsproc3_rename_3_svc(rename3args *argp, struct svc_req *rqstp) else result.status = NFS3ERR_PERM; - return &result; + async_rpc_send_reply(req, &result); } -link3res * -nfsproc3_link_3_svc(link3args *argp, struct svc_req *rqstp) +void nfsproc3_link_3_svc(link3args *argp, RPCRequest *req) { static link3res result; struct wcc_data wcc; @@ -655,21 +711,24 @@ nfsproc3_link_3_svc(link3args *argp, struct svc_req *rqstp) if (inode == NULL) { result.status = NFS3ERR_STALE; result.link3res_u.res.linkdir_wcc = wcc; - return &result; + async_rpc_send_reply(req, &result); + return; } BlueSkyInode *dir = lookup_fh(&argp->link.dir); if (dir == NULL) { result.status = NFS3ERR_STALE; result.link3res_u.res.linkdir_wcc = wcc; - return &result; + async_rpc_send_reply(req, &result); + return; } encode_pre_wcc(&wcc, dir); if (dir->type != BLUESKY_DIRECTORY) { result.status = NFS3ERR_NOTDIR; result.link3res_u.res.linkdir_wcc = wcc; - return &result; + async_rpc_send_reply(req, &result); + return; } if (!validate_filename(argp->link.name) @@ -679,13 +738,15 @@ nfsproc3_link_3_svc(link3args *argp, struct svc_req *rqstp) { result.status = NFS3ERR_EXIST; result.link3res_u.res.linkdir_wcc = wcc; - return &result; + 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; - return &result; + async_rpc_send_reply(req, &result); + return; } inode->nlink++; bluesky_inode_update_ctime(inode, 0); @@ -697,15 +758,14 @@ nfsproc3_link_3_svc(link3args *argp, struct svc_req *rqstp) encode_fattr3(&result.link3res_u.res.file_attributes.post_op_attr_u.attributes, inode); result.link3res_u.res.linkdir_wcc = wcc; - return &result; + async_rpc_send_reply(req, &result); } gint bluesky_dirent_compare(gconstpointer a, gconstpointer b, gpointer unused); -#define MAX_READDIR_DIRENTS 4 -readdir3res * -nfsproc3_readdir_3_svc(readdir3args *argp, struct svc_req *rqstp) +#define MAX_READDIR_DIRENTS 64 +void nfsproc3_readdir_3_svc(readdir3args *argp, RPCRequest *req) { static readdir3res result; @@ -713,7 +773,8 @@ nfsproc3_readdir_3_svc(readdir3args *argp, struct svc_req *rqstp) if (dir == NULL) { result.status = NFS3ERR_STALE; result.readdir3res_u.resfail.present = FALSE; - return &result; + async_rpc_send_reply(req, &result); + return; } result.status = NFS3_OK; @@ -747,19 +808,26 @@ nfsproc3_readdir_3_svc(readdir3args *argp, struct svc_req *rqstp) result.readdir3res_u.resok.reply.entries = NULL; result.readdir3res_u.resok.reply.eof = g_sequence_iter_is_end(i); - return &result; + async_rpc_send_reply(req, &result); } -readdirplus3res * -nfsproc3_readdirplus_3_svc(readdirplus3args *argp, struct svc_req *rqstp) +void nfsproc3_readdirplus_3_svc(readdirplus3args *argp, RPCRequest *req) { + /* XDR-encoded sizes: + * post_op_attr: 88 bytes + * base readdirplus3resok: 88 + 16 bytes + * base directory entry: 24 bytes + filename + * attributes/fh3: 88 + 8 + filehandle size + */ + size_t dircount = 88 + 16, attrcount = 0; static readdirplus3res result; BlueSkyInode *dir = lookup_fh(&argp->dir); if (dir == NULL) { result.status = NFS3ERR_STALE; result.readdirplus3res_u.resfail.present = FALSE; - return &result; + async_rpc_send_reply(req, &result); + return; } result.status = NFS3_OK; @@ -782,6 +850,11 @@ nfsproc3_readdirplus_3_svc(readdirplus3args *argp, struct svc_req *rqstp) BlueSkyDirent *d = g_sequence_get(i); BlueSkyInode *inode = bluesky_get_inode(fs, d->inum); if (inode != NULL) { + dircount += 24 + ((strlen(d->name) + 3) & ~3); + attrcount += 88 + 8 + 8; + if (dircount > argp->dircount + || dircount + attrcount > argp->maxcount) + break; dirents[count].fileid = d->inum; dirents[count].name = d->name; dirents[count].cookie = d->cookie; @@ -806,21 +879,37 @@ nfsproc3_readdirplus_3_svc(readdirplus3args *argp, struct svc_req *rqstp) result.readdirplus3res_u.resok.reply.entries = NULL; result.readdirplus3res_u.resok.reply.eof = g_sequence_iter_is_end(i); - return &result; + async_rpc_send_reply(req, &result); } -fsstat3res * -nfsproc3_fsstat_3_svc(nfs_fh3 *argp, struct svc_req *rqstp) +void nfsproc3_fsstat_3_svc(nfs_fh3 *argp, RPCRequest *req) { static fsstat3res result; - result.status = NFS3ERR_NOTSUPP; + BlueSkyInode *inode = lookup_fh(argp); + if (inode == NULL) { + result.status = NFS3ERR_STALE; + result.fsstat3res_u.resfail.present = FALSE; + async_rpc_send_reply(req, &result); + return; + } - return &result; + result.status = NFS3_OK; + result.fsstat3res_u.resok.obj_attributes.present = TRUE; + encode_fattr3(&result.fsstat3res_u.resok.obj_attributes.post_op_attr_u.attributes, inode); + + result.fsstat3res_u.resok.tbytes = (1 << 30); + result.fsstat3res_u.resok.fbytes = (1 << 30); + result.fsstat3res_u.resok.abytes = (1 << 30); + result.fsstat3res_u.resok.tfiles = 0; + result.fsstat3res_u.resok.ffiles = 0; + result.fsstat3res_u.resok.afiles = 0; + result.fsstat3res_u.resok.invarsec = 0; + + async_rpc_send_reply(req, &result); } -fsinfo3res * -nfsproc3_fsinfo_3_svc(nfs_fh3 *argp, struct svc_req *rqstp) +void nfsproc3_fsinfo_3_svc(nfs_fh3 *argp, RPCRequest *req) { static fsinfo3res result; @@ -841,11 +930,10 @@ nfsproc3_fsinfo_3_svc(nfs_fh3 *argp, struct svc_req *rqstp) result.fsinfo3res_u.resok.properties = FSF3_LINK | FSF3_SYMLINK | FSF3_HOMOGENEOUS | FSF3_CANSETTIME; - return &result; + async_rpc_send_reply(req, &result); } -pathconf3res * -nfsproc3_pathconf_3_svc(nfs_fh3 *argp, struct svc_req *rqstp) +void nfsproc3_pathconf_3_svc(nfs_fh3 *argp, RPCRequest *req) { static pathconf3res result; @@ -860,15 +948,14 @@ nfsproc3_pathconf_3_svc(nfs_fh3 *argp, struct svc_req *rqstp) result.pathconf3res_u.resok.case_insensitive = FALSE; result.pathconf3res_u.resok.case_preserving = TRUE; - return &result; + async_rpc_send_reply(req, &result); } -commit3res * -nfsproc3_commit_3_svc(commit3args *argp, struct svc_req *rqstp) +void nfsproc3_commit_3_svc(commit3args *argp, RPCRequest *req) { static commit3res result; result.status = NFS3ERR_NOTSUPP; - return &result; + async_rpc_send_reply(req, &result); }