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
{
read3res result;
memset(&result, 0, sizeof(result));
- char buf[32768];
+ char buf[NFS_MAXSIZE];
BlueSkyInode *inode = lookup_fh(req, &argp->file);
if (inode == NULL) {
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;
return;
}
+ /* 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);
+ }
+
g_mutex_lock(inode->lock);
encode_pre_wcc(&wcc, inode);
async_rpc_send_reply(req, &result);
return;
}
- g_mutex_lock(dir1->lock);
- encode_pre_wcc(wcc1, dir1);
BlueSkyInode *dir2 = lookup_fh(req, &argp->to.dir);
if (dir2 == NULL) {
result.status = NFS3ERR_STALE;
- g_mutex_unlock(dir1->lock);
async_rpc_send_reply(req, &result);
return;
}
- g_mutex_lock(dir2->lock);
+
+ 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(dir2->lock);
g_mutex_unlock(dir1->lock);
+ if (dir1->inum != dir2->inum)
+ g_mutex_unlock(dir2->lock);
async_rpc_send_reply(req, &result);
}
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;
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) {