+2004-06-22 Miklos Szeredi <mszeredi@inf.bme.hu>
+
+ * Add FS_BINARY_MOUNTDATA filesystem flag for kernels that define
+ it. This fixes mount problems on recent 2.6 kernels with SELinux
+ enabled
+
+ * Merge bugfixes from main branch (see below)
+
+2004-04-09 Miklos Szeredi <mszeredi@inf.bme.hu>
+
+ * Check some limits so userspace won't get too big requests
+
+2004-04-05 Miklos Szeredi <mszeredi@inf.bme.hu>
+
+ * Kill compile warning
+
+2004-03-02 Miklos Szeredi <mszeredi@inf.bme.hu>
+
+ * Fix for uClinux (Christian Magnusson)
+
+2004-02-12 Miklos Szeredi <mszeredi@inf.bme.hu>
+
+ * Remove MS_PERMISSION mount flag (that means something else now)
+
+2004-02-10 Miklos Szeredi <mszeredi@inf.bme.hu>
+
+ * Added check for i_size_read/write functions to configure.in
+ (patch by Valient Gough)
+
+2004-02-06 Miklos Szeredi <mszeredi@inf.bme.hu>
+
+ * Fixed writing >= 2G files
+
+ * Check file size on open (with generic_file_open())
+
+ * Readpage calls flush_dcache_page() after storing data
+
+ * Use i_size_read/write for accessing inode->i_size
+
+ * Make loopback mount of a fuse file work
+
2004-02-04 Miklos Szeredi <mszeredi@inf.bme.hu>
* Released 1.1
linux apps.
==============================================================================
+Name: C# bindings
+
+Author: Valient Gough <vgough at pobox com>
+
+Homepage: http://pobox.com/~vgough/fuse-csharp.html
+
+Description:
+
+ It allows you to write a Linux filesystem in C#. It uses the FUSE
+ library to do the actual Linux filesystem integration, and adds an
+ interface to the Mono runtime.
+
+==============================================================================
+Name: LUFS bridge (alpha)
+
+Author: Miklos Szeredi <mszeredi at inf bme hu>
+
+Homepage: http://sourceforge.net/project/showfiles.php?group_id=21636&package_id=109154
+
+Description:
+
+ This is a modified LUFS daemon, which uses the FUSE kernel module. It
+ is binary compatible with existing LUFS filesystems, so no
+ recompilation is needed.
+
+==============================================================================
+Name: btfs (Bluetooth FileSystemMapping)
+
+Author: Collin R. Mulliner <collin at betaversion net>
+
+Homepage: http://www.mulliner.org/bluetooth/btfs.php
+
+Description:
+
+ Btfs is a simple application to map some basic bluetooth functions
+ into the filesystem. With btfs a simple ls DEVICES shows you all
+ bluetooth devices within range and cp somefile OPUSH/devicename sends
+ the given file to the device.
+
+==============================================================================
+Name: mcachefs
+
+Author: Michael Still <mikal at stillhq com>
+
+Homepage: http://lists.samba.org/archive/linux/2004-March/010211.html
+
+Description:
+
+ mcachefs is a simple caching filesystem for Linux using FUSE. It
+ works by copying the file that you asked for when the file is
+ opened, and then using that copy for all subsequent requests for the
+ file. This is really a fairly naive approach to caching, and will be
+ improved in the future.
+
+==============================================================================
+Name: Fusedav
+
+Author: Lennart Poettering <mzshfrqni (at) 0pointer (dot) de>
+
+Homepage: http://0pointer.de/lennart/projects/fusedav/
+
+Description:
+
+ fusedav is a Linux userspace file system driver for mounting WebDAV
+ shares. It makes use of FUSE as userspace file system API and neon
+ as WebDAV API.
+
+==============================================================================
AC_INIT(lib/fuse.c)
-AM_INIT_AUTOMAKE(fuse, 1.1)
+AM_INIT_AUTOMAKE(fuse, 1.2)
AM_CONFIG_HEADER(include/config.h)
AC_PROG_CC
AC_SUBST(majver)
AC_SUBST(kmoduledir)
subdirs="$subdirs kernel"
+
+ if echo "$kernsrcver" | grep -q "^2.4"; then
+ old_cflags="$CFLAGS"
+ CFLAGS="-I${kernelsrc}/include -Wall -O2 -fno-strict-aliasing -D__KERNEL__"
+ AC_CHECK_DECL(i_size_read,
+ AC_DEFINE(HAVE_I_SIZE_FUNC, 1,
+ [Kernel has i_size_read() and i_size_write() functions]),,
+ [#include <linux/fs.h>])
+ CFLAGS="$old_cflags"
+ fi
fi
if test "$enable_lib" != "no"; then
.statfs = xmp_statfs,
.release = xmp_release,
.fsync = xmp_fsync
-
};
int main(int argc, char *argv[])
/* Conservative buffer size for the client */
#define FUSE_MAX_IN 8192
+#define FUSE_NAME_MAX 1024
+#define FUSE_SYMLINK_MAX 4096
+
struct fuse_lookup_out {
unsigned long ino;
struct fuse_attr attr;
static void change_attributes(struct inode *inode, struct fuse_attr *attr)
{
- if(S_ISREG(inode->i_mode) && inode->i_size != attr->size) {
+ if(S_ISREG(inode->i_mode) && i_size_read(inode) != attr->size) {
#ifdef KERNEL_2_6
invalidate_inode_pages(inode->i_mapping);
#else
inode->i_nlink = attr->nlink;
inode->i_uid = attr->uid;
inode->i_gid = attr->gid;
- inode->i_size = attr->size;
+ i_size_write(inode, attr->size);
inode->i_blksize = PAGE_CACHE_SIZE;
inode->i_blocks = attr->blocks;
#ifdef KERNEL_2_6
static void fuse_init_inode(struct inode *inode, struct fuse_attr *attr)
{
inode->i_mode = attr->mode & S_IFMT;
- inode->i_size = attr->size;
+ i_size_write(inode, attr->size);
if(S_ISREG(inode->i_mode)) {
inode->i_op = &fuse_file_inode_operations;
fuse_init_file_inode(inode);
struct fuse_in in = FUSE_IN_INIT;
struct fuse_out out = FUSE_OUT_INIT;
+ if (entry->d_name.len > FUSE_NAME_MAX)
+ return -ENAMETOOLONG;
+
in.h.opcode = FUSE_LOOKUP;
in.h.ino = dir->i_ino;
in.numargs = 1;
struct fuse_conn *fc = INO_FC(dir);
struct fuse_in in = FUSE_IN_INIT;
struct fuse_out out = FUSE_OUT_INIT;
+ unsigned int len = strlen(link) + 1;
+
+ if (len > FUSE_SYMLINK_MAX)
+ return -ENAMETOOLONG;
in.h.opcode = FUSE_SYMLINK;
in.h.ino = dir->i_ino;
in.numargs = 2;
in.args[0].size = entry->d_name.len + 1;
in.args[0].value = entry->d_name.name;
- in.args[1].size = strlen(link) + 1;
+ in.args[1].size = len;
in.args[1].value = link;
request_send(fc, &in, &out);
if(out.h.error)
if(!out.h.error) {
if(attr->ia_valid & ATTR_SIZE &&
- outarg.attr.size < inode->i_size)
+ outarg.attr.size < i_size_read(inode))
vmtruncate(inode, outarg.attr.size);
change_attributes(inode, &outarg.attr);
#ifndef KERNEL_2_6
#define PageUptodate(page) Page_Uptodate(page)
+#ifndef filemap_fdatawrite
+#ifndef NO_MM
#define filemap_fdatawrite filemap_fdatasync
+#else
+#define filemap_fdatawrite do {} while(0)
+#endif
+#endif
#endif
static int fuse_open(struct inode *inode, struct file *file)
struct fuse_in in = FUSE_IN_INIT;
struct fuse_out out = FUSE_OUT_INIT;
struct fuse_open_in inarg;
+ int err;
+
+ err = generic_file_open(inode, file);
+ if(err)
+ return err;
/* If opening the root node, no lookup has been performed on
it, so the attributes must be refreshed */
size_t outsize = out.args[0].size;
if(outsize < PAGE_CACHE_SIZE)
memset(buffer + outsize, 0, PAGE_CACHE_SIZE - outsize);
+ flush_dcache_page(page);
SetPageUptodate(page);
}
{
size_t index = bl_index << FUSE_BLOCK_PAGE_SHIFT;
size_t end_index = ((bl_index + 1) << FUSE_BLOCK_PAGE_SHIFT) - 1;
- size_t file_end_index = inode->i_size >> PAGE_CACHE_SHIFT;
+ size_t file_end_index = i_size_read(inode) >> PAGE_CACHE_SHIFT;
if (end_index > file_end_index)
end_index = file_end_index;
{
size_t start_index = bl_index << FUSE_BLOCK_PAGE_SHIFT;
size_t end_index = ((bl_index + 1) << FUSE_BLOCK_PAGE_SHIFT) - 1;
- size_t file_end_index = inode->i_size >> PAGE_CACHE_SHIFT;
+ size_t file_end_index = i_size_read(inode) >> PAGE_CACHE_SHIFT;
int i;
buffer = kmap(page);
memcpy(buffer, bl_buf + i * PAGE_CACHE_SIZE,
PAGE_CACHE_SIZE);
+ flush_dcache_page(page);
SetPageUptodate(page);
kunmap(page);
}
{
size_t bl_index = pos >> FUSE_BLOCK_SHIFT;
size_t bl_end_index = (pos + count) >> FUSE_BLOCK_SHIFT;
- size_t bl_file_end_index = inode->i_size >> FUSE_BLOCK_SHIFT;
+ size_t bl_file_end_index = i_size_read(inode) >> FUSE_BLOCK_SHIFT;
if (bl_end_index > bl_file_end_index)
bl_end_index = bl_file_end_index;
static int get_write_count(struct inode *inode, struct page *page)
{
unsigned long end_index;
+ loff_t size = i_size_read(inode);
int count;
- end_index = inode->i_size >> PAGE_CACHE_SHIFT;
+ end_index = size >> PAGE_CACHE_SHIFT;
if(page->index < end_index)
count = PAGE_CACHE_SIZE;
else {
- count = inode->i_size & (PAGE_CACHE_SIZE - 1);
+ count = size & (PAGE_CACHE_SIZE - 1);
if(page->index > end_index || count == 0)
return 0;
}
err = write_buffer(inode, page, offset, to - offset);
if(!err) {
loff_t pos = (page->index << PAGE_CACHE_SHIFT) + to;
- if(pos > inode->i_size)
- inode->i_size = pos;
+ if(pos > i_size_read(inode))
+ i_size_write(inode, pos);
}
return err;
}
static struct file_operations fuse_file_operations = {
- .open = fuse_open,
- .release = fuse_release,
- .fsync = fuse_fsync,
- .read = fuse_file_read,
- .write = generic_file_write,
- .mmap = generic_file_mmap,
+ .read = fuse_file_read,
+ .write = generic_file_write,
+ .mmap = generic_file_mmap,
+ .open = fuse_open,
+ .release = fuse_release,
+ .fsync = fuse_fsync,
+#ifdef KERNEL_2_6
+ .sendfile = generic_file_sendfile,
+#endif
};
static struct address_space_operations fuse_file_aops = {
#define MODVERSIONS
#include <linux/modversions.h>
#endif
+#include <config.h>
+#ifndef HAVE_I_SIZE_FUNC
+#define i_size_read(inode) ((inode)->i_size)
+#define i_size_write(inode, size) do { (inode)->i_size = size; } while(0)
+#endif
#endif
#include <linux/kernel.h>
#include <linux/module.h>
};
#ifdef KERNEL_2_6
-#define SB_FC(sb) ((struct fuse_conn *) (sb)->s_fs_info)
+#define SB_FC(sb) ((sb)->s_fs_info)
#else
-#define SB_FC(sb) ((struct fuse_conn *) (sb)->u.generic_sbp)
+#define SB_FC(sb) ((sb)->u.generic_sbp)
#endif
#define INO_FC(inode) SB_FC((inode)->i_sb)
#define DEV_FC(file) ((struct fuse_conn *) (file)->private_data)
/*
FUSE: Filesystem in Userspace
- Copyright (C) 2001 Miklos Szeredi (mszeredi@inf.bme.hu)
+ Copyright (C) 2001 Miklos Szeredi (mszeredi@inf.bme.hu)
This program can be distributed under the terms of the GNU GPL.
See the file COPYING.
#define kstatfs statfs
#endif
+#ifndef FS_BINARY_MOUNTDATA
+#define FS_BINARY_MOUNTDATA 0
+#endif
+
static void fuse_read_inode(struct inode *inode)
{
/* No op */
static void convert_fuse_statfs(struct kstatfs *stbuf, struct fuse_kstatfs *attr)
{
- stbuf->f_type = FUSE_SUPER_MAGIC;
- stbuf->f_bsize = attr->block_size;
- stbuf->f_blocks = attr->blocks;
- stbuf->f_bfree = stbuf->f_bavail = attr->blocks_free;
- stbuf->f_files = attr->files;
- stbuf->f_ffree = attr->files_free;
+ stbuf->f_type = FUSE_SUPER_MAGIC;
+ stbuf->f_bsize = attr->block_size;
+ stbuf->f_blocks = attr->blocks;
+ stbuf->f_bfree = stbuf->f_bavail = attr->blocks_free;
+ stbuf->f_files = attr->files;
+ stbuf->f_ffree = attr->files_free;
/* Is this field necessary? Most filesystems ignore it...
stbuf->f_fsid.val[0] = (FUSE_SUPER_MAGIC>>16)&0xffff;
- stbuf->f_fsid.val[1] = FUSE_SUPER_MAGIC &0xffff; */
+ stbuf->f_fsid.val[1] = FUSE_SUPER_MAGIC &0xffff; */
stbuf->f_namelen = attr->namelen;
}
struct fuse_in in = FUSE_IN_INIT;
struct fuse_out out = FUSE_OUT_INIT;
struct fuse_statfs_out outarg;
-
+
in.numargs = 0;
in.h.opcode = FUSE_STATFS;
out.numargs = 1;
struct inode *root;
struct fuse_mount_data *d = data;
- sb->s_blocksize = PAGE_CACHE_SIZE;
- sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
- sb->s_magic = FUSE_SUPER_MAGIC;
- sb->s_op = &fuse_super_operations;
+ sb->s_blocksize = PAGE_CACHE_SIZE;
+ sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
+ sb->s_magic = FUSE_SUPER_MAGIC;
+ sb->s_op = &fuse_super_operations;
+ sb->s_maxbytes = MAX_LFS_FILESIZE;
#ifdef KERNEL_2_6
sb->s_export_op = &fuse_export_operations;
#endif
spin_unlock(&fuse_lock);
/* fc is needed in fuse_init_file_inode which could be called
- from get_root_inode */
+ from get_root_inode */
SB_FC(sb) = fc;
root = get_root_inode(sb, d->rootmode);
int flags, const char *dev_name,
void *raw_data)
{
- return get_sb_nodev(fs_type, flags, raw_data, fuse_read_super);
+ return get_sb_nodev(fs_type, flags, raw_data, fuse_read_super);
}
static struct file_system_type fuse_fs_type = {
- .owner = THIS_MODULE,
- .name = "fuse",
- .get_sb = fuse_get_sb,
- .kill_sb = kill_anon_super,
- .fs_flags = 0
+ .owner = THIS_MODULE,
+ .name = "fuse",
+ .get_sb = fuse_get_sb,
+ .kill_sb = kill_anon_super,
+ .fs_flags = FS_BINARY_MOUNTDATA,
};
#else
static struct super_block *fuse_read_super_compat(struct super_block *sb,
fflush(stdout);
}
- /* This needs to be done before the reply because otherwise the
- scheduler can tricks with us, and only let the counter be increased
+ /* This needs to be done before the reply, otherwise the scheduler
+ could play tricks with us, and only let the counter be increased
long after the operation is done */
inc_avail(f);
res = write(f->fd, outbuf, outsize);
if(res == -1) {
/* ENOENT means the operation was interrupted */
- if(errno != ENOENT)
+ if(!f->exited && errno != ENOENT)
perror("fuse: writing device");
return -errno;
}
#define CHECK_PERMISSION 1
-#ifndef MS_PERMISSION
-#define MS_PERMISSION 128
-#endif
-
#define FUSE_DEV "/proc/fs/fuse/dev"
#define FUSE_MOUNTED_ENV "_FUSE_MOUNTED"
res = drop_privs();
if(res == -1)
return -1;
-
- flags |= MS_PERMISSION;
}
data.version = FUSE_KERNEL_VERSION;
projects / qemu-gpiodev / libfuse.git / commitdiff