fuse: add flag to turn on big writes
Prior to 2.6.26 fuse only supported single page write requests. In theory all fuse filesystem should be able support bigger than 4k writes, as there's nothing in the API to prevent it. Unfortunately there's a known case in NTFS-3G where big writes cause filesystem corruption. There could also be other filesystems, where the lack of testing with big write requests would result in bugs. To prevent such problems on a kernel upgrade, disable big writes by default, but let filesystems set a flag to turn it on. Signed-off-by: Miklos Szeredi <mszeredi@suse.cz> Cc: Szabolcs Szakacsits <szaka@ntfs-3g.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Родитель
0f146a764f
Коммит
78bb6cb9a8
|
@ -804,6 +804,8 @@ static ssize_t fuse_fill_write_pages(struct fuse_req *req,
|
|||
if (offset == PAGE_CACHE_SIZE)
|
||||
offset = 0;
|
||||
|
||||
if (!fc->big_writes)
|
||||
break;
|
||||
} while (iov_iter_count(ii) && count < fc->max_write &&
|
||||
req->num_pages < FUSE_MAX_PAGES_PER_REQ && offset == 0);
|
||||
|
||||
|
|
|
@ -404,6 +404,9 @@ struct fuse_conn {
|
|||
/** Is bmap not implemented by fs? */
|
||||
unsigned no_bmap : 1;
|
||||
|
||||
/** Do multi-page cached writes */
|
||||
unsigned big_writes : 1;
|
||||
|
||||
/** The number of requests waiting for completion */
|
||||
atomic_t num_waiting;
|
||||
|
||||
|
|
|
@ -576,6 +576,8 @@ static void process_init_reply(struct fuse_conn *fc, struct fuse_req *req)
|
|||
fc->no_lock = 1;
|
||||
if (arg->flags & FUSE_ATOMIC_O_TRUNC)
|
||||
fc->atomic_o_trunc = 1;
|
||||
if (arg->flags & FUSE_BIG_WRITES)
|
||||
fc->big_writes = 1;
|
||||
} else {
|
||||
ra_pages = fc->max_read / PAGE_CACHE_SIZE;
|
||||
fc->no_lock = 1;
|
||||
|
@ -599,7 +601,8 @@ static void fuse_send_init(struct fuse_conn *fc, struct fuse_req *req)
|
|||
arg->major = FUSE_KERNEL_VERSION;
|
||||
arg->minor = FUSE_KERNEL_MINOR_VERSION;
|
||||
arg->max_readahead = fc->bdi.ra_pages * PAGE_CACHE_SIZE;
|
||||
arg->flags |= FUSE_ASYNC_READ | FUSE_POSIX_LOCKS | FUSE_ATOMIC_O_TRUNC;
|
||||
arg->flags |= FUSE_ASYNC_READ | FUSE_POSIX_LOCKS | FUSE_ATOMIC_O_TRUNC |
|
||||
FUSE_BIG_WRITES;
|
||||
req->in.h.opcode = FUSE_INIT;
|
||||
req->in.numargs = 1;
|
||||
req->in.args[0].size = sizeof(*arg);
|
||||
|
|
|
@ -109,6 +109,7 @@ struct fuse_file_lock {
|
|||
#define FUSE_POSIX_LOCKS (1 << 1)
|
||||
#define FUSE_FILE_OPS (1 << 2)
|
||||
#define FUSE_ATOMIC_O_TRUNC (1 << 3)
|
||||
#define FUSE_BIG_WRITES (1 << 5)
|
||||
|
||||
/**
|
||||
* Release flags
|
||||
|
|
Загрузка…
Ссылка в новой задаче