diff options
| author | Miklos Szeredi <miklos@szeredi.hu> | 2009-06-18 11:19:14 +0000 |
|---|---|---|
| committer | Miklos Szeredi <miklos@szeredi.hu> | 2009-06-18 11:19:14 +0000 |
| commit | 6ae8980d69849a257fe571e02cc6f8f1befb07cd (patch) | |
| tree | c4ee7048ced48f475d19900118be923aa9c4dcdb /lib/fuse_lowlevel.c | |
| parent | ae9bfde712697205ac8809edc431cb7c0bdd484f (diff) | |
| download | android_external_fuse-6ae8980d69849a257fe571e02cc6f8f1befb07cd.tar.gz android_external_fuse-6ae8980d69849a257fe571e02cc6f8f1befb07cd.tar.bz2 android_external_fuse-6ae8980d69849a257fe571e02cc6f8f1befb07cd.zip | |
CUSE patches from Tejun Heo (add new files)
Diffstat (limited to 'lib/fuse_lowlevel.c')
| -rw-r--r-- | lib/fuse_lowlevel.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c index e3b5d5d..a60c5b8 100644 --- a/lib/fuse_lowlevel.c +++ b/lib/fuse_lowlevel.c @@ -1175,7 +1175,7 @@ static void do_init(fuse_req_t req, fuse_ino_t nodeid, const void *inarg) if (f->atomic_o_trunc) f->conn.want |= FUSE_CAP_ATOMIC_O_TRUNC; - if (f->op.getlk && f->op.setlk) + if (f->op.getlk && f->op.setlk && !f->no_remote_lock) f->conn.want |= FUSE_CAP_POSIX_LOCKS; if (f->big_writes) f->conn.want |= FUSE_CAP_BIG_WRITES; @@ -1442,6 +1442,7 @@ static struct fuse_opt fuse_ll_opts[] = { { "async_read", offsetof(struct fuse_ll, conn.async_read), 1 }, { "sync_read", offsetof(struct fuse_ll, conn.async_read), 0 }, { "atomic_o_trunc", offsetof(struct fuse_ll, atomic_o_trunc), 1}, + { "no_remote_lock", offsetof(struct fuse_ll, no_remote_lock), 1}, { "big_writes", offsetof(struct fuse_ll, big_writes), 1}, FUSE_OPT_KEY("max_read=", FUSE_OPT_KEY_DISCARD), FUSE_OPT_KEY("-h", KEY_HELP), @@ -1465,7 +1466,8 @@ static void fuse_ll_help(void) " -o async_read perform reads asynchronously (default)\n" " -o sync_read perform reads synchronously\n" " -o atomic_o_trunc enable atomic open+truncate support\n" -" -o big_writes enable larger than 4kB writes\n"); +" -o big_writes enable larger than 4kB writes\n" +" -o no_remote_lock disable remote file locking\n"); } static int fuse_ll_opt_proc(void *data, const char *arg, int key, |