struct bch_inode_unpacked *bi)
{
return (struct stat) {
- .st_ino = bi->bi_inum,
+ .st_ino = unmap_root_ino(bi->bi_inum),
.st_size = bi->bi_size,
.st_mode = bi->bi_mode,
.st_uid = bi->bi_uid,
struct bch_inode_unpacked *bi)
{
return (struct fuse_entry_param) {
- .ino = bi->bi_inum,
+ .ino = unmap_root_ino(bi->bi_inum),
.generation = bi->bi_generation,
.attr = inode_to_stat(c, bi),
.attr_timeout = DBL_MAX,
u64 inum;
int ret;
+ fuse_log(FUSE_LOG_DEBUG, "fuse_lookup(dir=%llu name=%s)\n",
+ dir, name);
+
dir = map_root_ino(dir);
ret = bch2_inode_find_by_inum(c, dir, &bi);
inum = bch2_dirent_lookup(c, dir, &hash_info, &qstr);
if (!inum) {
- ret = -ENOENT;
- goto err;
+ struct fuse_entry_param e = {
+ .attr_timeout = DBL_MAX,
+ .entry_timeout = DBL_MAX,
+ };
+ fuse_reply_entry(req, &e);
+ return;
}
ret = bch2_inode_find_by_inum(c, inum, &bi);
if (ret)
goto err;
- bi.bi_inum = unmap_root_ino(bi.bi_inum);
+ fuse_log(FUSE_LOG_DEBUG, "fuse_lookup ret(inum=%llu)\n",
+ bi.bi_inum);
struct fuse_entry_param e = inode_to_entry(c, &bi);
fuse_reply_entry(req, &e);
return;
err:
+ fuse_log(FUSE_LOG_DEBUG, "fuse_lookup error %i\n", ret);
fuse_reply_err(req, -ret);
}
struct stat attr;
int ret;
+ fuse_log(FUSE_LOG_DEBUG, "fuse_getattr(inum=%llu)\n",
+ inum);
+
inum = map_root_ino(inum);
ret = bch2_inode_find_by_inum(c, inum, &bi);
if (ret) {
+ fuse_log(FUSE_LOG_DEBUG, "fuse_getattr error %i\n", ret);
fuse_reply_err(req, -ret);
return;
}
- bi.bi_inum = unmap_root_ino(bi.bi_inum);
+ fuse_log(FUSE_LOG_DEBUG, "fuse_getattr success\n");
attr = inode_to_stat(c, &bi);
fuse_reply_attr(req, &attr, DBL_MAX);
}
}
-static void bcachefs_fuse_readlink(fuse_req_t req, fuse_ino_t inum)
-{
- //struct bch_fs *c = fuse_req_userdata(req);
-
- //char *link = malloc();
-
- //fuse_reply_readlink(req, link);
-}
-
static int do_create(struct bch_fs *c, u64 dir,
const char *name, mode_t mode, dev_t rdev,
struct bch_inode_unpacked *new_inode)
static void bcachefs_fuse_mkdir(fuse_req_t req, fuse_ino_t dir,
const char *name, mode_t mode)
{
+ BUG_ON(mode & S_IFMT);
+
+ mode |= S_IFDIR;
bcachefs_fuse_mknod(req, dir, name, mode, 0);
}
bcachefs_fuse_unlink(req, dir, name);
}
-#if 0
-static void bcachefs_fuse_symlink(fuse_req_t req, const char *link,
- fuse_ino_t parent, const char *name)
-{
- struct bch_fs *c = fuse_req_userdata(req);
-}
-#endif
-
static void bcachefs_fuse_rename(fuse_req_t req,
fuse_ino_t src_dir, const char *srcname,
fuse_ino_t dst_dir, const char *dstname,
struct qstr qstr = QSTR(newname);
int ret;
+ newparent = map_root_ino(newparent);
+
ret = bch2_trans_do(c, NULL, BTREE_INSERT_ATOMIC,
bch2_link_trans(&trans, newparent,
inum, &inode_u, &qstr));
/* Handle unaligned start and end */
/* TODO: align to block_bytes, sector size, or page size? */
-static void align_io(struct fuse_align_io *align, const struct bch_fs *c,
- size_t size, off_t offset)
+static struct fuse_align_io align_io(const struct bch_fs *c, size_t size,
+ off_t offset)
{
+ struct fuse_align_io align;
+
BUG_ON(offset < 0);
- align->start = round_down(offset, block_bytes(c));
- align->pad_start = offset - align->start;
+ align.start = round_down(offset, block_bytes(c));
+ align.pad_start = offset - align.start;
off_t end = offset + size;
- align->end = round_up(end, block_bytes(c));
- align->pad_end = align->end - end;
+ align.end = round_up(end, block_bytes(c));
+ align.pad_end = align.end - end;
+
+ align.size = align.end - align.start;
- align->size = align->end - align->start;
+ return align;
}
/*
struct fuse_file_info *fi)
{
struct bch_fs *c = fuse_req_userdata(req);
- struct fuse_align_io align;
fuse_log(FUSE_LOG_DEBUG, "bcachefs_fuse_read(%llu, %zd, %lld)\n",
inum, size, offset);
}
size = end - offset;
- align_io(&align, c, size, offset);
+ struct fuse_align_io align = align_io(c, size, offset);
void *buf = aligned_alloc(PAGE_SIZE, align.size);
if (!buf) {
free(buf);
}
-static int write_set_inode(struct bch_fs *c, fuse_ino_t inum, off_t new_size)
+static int inode_update_times(struct bch_fs *c, fuse_ino_t inum)
{
struct btree_trans trans;
struct btree_iter *iter;
if (ret)
goto err;
- inode_u.bi_size = max_t(u64, inode_u.bi_size, new_size);
inode_u.bi_mtime = now;
inode_u.bi_ctime = now;
static int write_aligned(struct bch_fs *c, fuse_ino_t inum,
struct bch_io_opts io_opts, void *buf,
size_t aligned_size, off_t aligned_offset,
- size_t *written_out)
+ off_t new_i_size, size_t *written_out)
{
struct bch_write_op op = { 0 };
struct bio_vec bv;
op.nr_replicas = io_opts.data_replicas;
op.target = io_opts.foreground_target;
op.pos = POS(inum, aligned_offset >> 9);
+ op.new_i_size = new_i_size;
userbio_init(&op.wbio.bio, &bv, buf, aligned_size);
bio_set_op_attrs(&op.wbio.bio, REQ_OP_WRITE, REQ_SYNC);
{
struct bch_fs *c = fuse_req_userdata(req);
struct bch_io_opts io_opts;
- struct fuse_align_io align;
size_t aligned_written;
int ret = 0;
fuse_log(FUSE_LOG_DEBUG, "bcachefs_fuse_write(%llu, %zd, %lld)\n",
inum, size, offset);
- align_io(&align, c, size, offset);
+ struct fuse_align_io align = align_io(c, size, offset);
if (get_inode_io_opts(c, inum, &io_opts)) {
ret = -ENOENT;
/* Actually write. */
ret = write_aligned(c, inum, io_opts, aligned_buf,
- align.size, align.start, &aligned_written);
+ align.size, align.start,
+ offset + size, &aligned_written);
/* Figure out how many unaligned bytes were written. */
size_t written = align_fix_up_bytes(&align, aligned_written);
ret = 0;
/*
- * Update inode data.
+ * Update inode times.
* TODO: Integrate with bch2_extent_update()
*/
if (!ret)
- ret = write_set_inode(c, inum, offset + written);
+ ret = inode_update_times(c, inum);
if (!ret) {
BUG_ON(written == 0);
fuse_reply_err(req, -ret);
}
+static void bcachefs_fuse_symlink(fuse_req_t req, const char *link,
+ fuse_ino_t dir, const char *name)
+{
+ struct bch_fs *c = fuse_req_userdata(req);
+ struct bch_inode_unpacked new_inode;
+ size_t link_len = strlen(link);
+ int ret;
+
+ dir = map_root_ino(dir);
+
+ ret = do_create(c, dir, name, S_IFLNK|S_IRWXUGO, 0, &new_inode);
+ if (ret)
+ goto err;
+
+ struct bch_io_opts io_opts;
+ ret = get_inode_io_opts(c, new_inode.bi_inum, &io_opts);
+ if (ret)
+ goto err;
+
+ struct fuse_align_io align = align_io(c, link_len + 1, 0);
+
+ void *aligned_buf = aligned_alloc(PAGE_SIZE, align.size);
+ memset(aligned_buf, 0, align.size);
+ memcpy(aligned_buf, link, link_len); /* already terminated */
+
+ size_t aligned_written;
+ ret = write_aligned(c, new_inode.bi_inum, io_opts, aligned_buf,
+ align.size, align.start, link_len + 1,
+ &aligned_written);
+ free(aligned_buf);
+
+ if (ret)
+ goto err;
+
+ size_t written = align_fix_up_bytes(&align, aligned_written);
+ BUG_ON(written != link_len + 1); // TODO: handle short
+
+ ret = inode_update_times(c, new_inode.bi_inum);
+ if (ret)
+ goto err;
+
+ new_inode.bi_size = written;
+
+ struct fuse_entry_param e = inode_to_entry(c, &new_inode);
+ fuse_reply_entry(req, &e);
+ return;
+
+err:
+ fuse_reply_err(req, -ret);
+}
+
+static void bcachefs_fuse_readlink(fuse_req_t req, fuse_ino_t inum)
+{
+ struct bch_fs *c = fuse_req_userdata(req);
+ char *buf = NULL;
+
+ struct bch_inode_unpacked bi;
+ int ret = bch2_inode_find_by_inum(c, inum, &bi);
+ if (ret)
+ goto err;
+
+ struct fuse_align_io align = align_io(c, bi.bi_size, 0);
+
+ ret = -ENOMEM;
+ buf = aligned_alloc(PAGE_SIZE, align.size);
+ if (!buf)
+ goto err;
+
+ ret = read_aligned(c, inum, align.size, align.start, buf);
+ if (ret)
+ goto err;
+
+ BUG_ON(buf[align.size - 1] != 0);
+
+ fuse_reply_readlink(req, buf);
+
+err:
+ if (ret)
+ fuse_reply_err(req, -ret);
+
+ free(buf);
+}
+
#if 0
/*
* FUSE flush is essentially the close() call, however it is not guaranteed
}
#endif
-struct fuse_dir_entry {
- u64 ino;
- unsigned type;
- char name[0];
-};
-
struct fuse_dir_context {
struct dir_context ctx;
fuse_req_t req;
char *buf;
size_t bufsize;
+};
- struct fuse_dir_entry *prev;
+struct fuse_dirent {
+ uint64_t ino;
+ uint64_t off;
+ uint32_t namelen;
+ uint32_t type;
+ char name[];
};
-static int fuse_send_dir_entry(struct fuse_dir_context *ctx, loff_t pos)
-{
- struct fuse_dir_entry *de = ctx->prev;
- ctx->prev = NULL;
+#define FUSE_NAME_OFFSET offsetof(struct fuse_dirent, name)
+#define FUSE_DIRENT_ALIGN(x) \
+ (((x) + sizeof(uint64_t) - 1) & ~(sizeof(uint64_t) - 1))
- struct stat statbuf = {
- .st_ino = unmap_root_ino(de->ino),
- .st_mode = de->type << 12,
- };
+static size_t fuse_add_direntry2(char *buf, size_t bufsize,
+ const char *name, int namelen,
+ const struct stat *stbuf, off_t off)
+{
+ size_t entlen = FUSE_NAME_OFFSET + namelen;
+ size_t entlen_padded = FUSE_DIRENT_ALIGN(entlen);
+ struct fuse_dirent *dirent = (struct fuse_dirent *) buf;
- size_t len = fuse_add_direntry(ctx->req, ctx->buf, ctx->bufsize,
- de->name, &statbuf, pos);
+ if ((buf == NULL) || (entlen_padded > bufsize))
+ return entlen_padded;
- free(de);
+ dirent->ino = stbuf->st_ino;
+ dirent->off = off;
+ dirent->namelen = namelen;
+ dirent->type = (stbuf->st_mode & S_IFMT) >> 12;
+ memcpy(dirent->name, name, namelen);
+ memset(dirent->name + namelen, 0, entlen_padded - entlen);
- if (len > ctx->bufsize)
- return -EINVAL;
-
- ctx->buf += len;
- ctx->bufsize -= len;
-
- return 0;
+ return entlen_padded;
}
static int fuse_filldir(struct dir_context *_ctx,
struct fuse_dir_context *ctx =
container_of(_ctx, struct fuse_dir_context, ctx);
- fuse_log(FUSE_LOG_DEBUG, "fuse_filldir(ctx={.ctx={.pos=%llu}}, "
- "name=%s, namelen=%d, pos=%lld, dir=%llu, type=%u)\n",
- ctx->ctx.pos, name, namelen, pos, ino, type);
+ struct stat statbuf = {
+ .st_ino = unmap_root_ino(ino),
+ .st_mode = type << 12,
+ };
- /*
- * We have to emit directory entries after reading the next entry,
- * because the previous entry contains a pointer to next.
- */
- if (ctx->prev) {
- int ret = fuse_send_dir_entry(ctx, pos);
- if (ret)
- return ret;
- }
+ fuse_log(FUSE_LOG_DEBUG, "fuse_filldir(name=%s inum=%llu pos=%llu)\n",
+ name, statbuf.st_ino, pos);
- struct fuse_dir_entry *cur = malloc(sizeof *cur + namelen + 1);
- cur->ino = ino;
- cur->type = type;
- memcpy(cur->name, name, namelen);
- cur->name[namelen] = 0;
+ size_t len = fuse_add_direntry2(ctx->buf,
+ ctx->bufsize,
+ name,
+ namelen,
+ &statbuf,
+ pos + 1);
- ctx->prev = cur;
+ if (len > ctx->bufsize)
+ return -1;
+ ctx->buf += len;
+ ctx->bufsize -= len;
return 0;
}
static bool handle_dots(struct fuse_dir_context *ctx, fuse_ino_t dir)
{
- int ret = 0;
-
if (ctx->ctx.pos == 0) {
- ret = fuse_filldir(&ctx->ctx, ".", 1, ctx->ctx.pos,
- unmap_root_ino(dir), DT_DIR);
- if (ret < 0)
+ if (fuse_filldir(&ctx->ctx, ".", 1, ctx->ctx.pos,
+ dir, DT_DIR) < 0)
return false;
ctx->ctx.pos = 1;
}
if (ctx->ctx.pos == 1) {
- ret = fuse_filldir(&ctx->ctx, "..", 2, ctx->ctx.pos,
- /*TODO: parent*/ 1, DT_DIR);
- if (ret < 0)
+ if (fuse_filldir(&ctx->ctx, "..", 2, ctx->ctx.pos,
+ /*TODO: parent*/ 1, DT_DIR) < 0)
return false;
ctx->ctx.pos = 2;
}
goto reply;
ret = bch2_readdir(c, dir, &ctx.ctx);
-
reply:
- /*
- * If we have something to send, the error above doesn't matter.
- *
- * Alternatively, if this send fails, but we previously sent something,
- * then this is a success.
- */
- if (ctx.prev) {
- ret = fuse_send_dir_entry(&ctx, ctx.ctx.pos);
- if (ret && ctx.buf != buf)
- ret = 0;
- }
-
if (!ret) {
fuse_log(FUSE_LOG_DEBUG, "bcachefs_fuse_readdir reply %zd\n",
ctx.buf - buf);
.mkdir = bcachefs_fuse_mkdir,
.unlink = bcachefs_fuse_unlink,
.rmdir = bcachefs_fuse_rmdir,
- //.symlink = bcachefs_fuse_symlink,
+ .symlink = bcachefs_fuse_symlink,
.rename = bcachefs_fuse_rename,
.link = bcachefs_fuse_link,
.open = bcachefs_fuse_open,
projects / bcachefs-tools-debian / blobdiff