aboutsummaryrefslogtreecommitdiffstats
path: root/lib/modules
diff options
context:
space:
mode:
authorNikolaus Rath <Nikolaus@rath.org>2016-10-20 15:45:32 -0700
committerNikolaus Rath <Nikolaus@rath.org>2016-10-20 15:45:32 -0700
commit1d9f26f3736cc4703c2e988d87f5dd119bcd736d (patch)
treea2e7aabb5ce872585d0005eed196de9c0fdb029c /lib/modules
parent8ee553dac0297cfd75cbdd2d9cfdce37e22ef4ee (diff)
downloadlibfuse-1d9f26f3736cc4703c2e988d87f5dd119bcd736d.tar.gz
Turn fuse_operations.nopath_flag into fuse_config.nullpath_ok
Modifying struct fuse_config in the init() handler is the canonical way to adjust file-system implementation specific settings. There is no need to have flags in struct fuse_operations.
Diffstat (limited to 'lib/modules')
-rw-r--r--lib/modules/iconv.c4
-rw-r--r--lib/modules/subdir.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/modules/iconv.c b/lib/modules/iconv.c
index b0453be..5d1e959 100644
--- a/lib/modules/iconv.c
+++ b/lib/modules/iconv.c
@@ -561,6 +561,8 @@ static void *iconv_init(struct fuse_conn_info *conn,
{
struct iconv *ic = iconv_get();
fuse_fs_init(ic->next, conn, cfg);
+ /* Don't touch cfg->nullpath_ok, we can work with
+ either */
return ic;
}
@@ -612,8 +614,6 @@ static const struct fuse_operations iconv_oper = {
.lock = iconv_lock,
.flock = iconv_flock,
.bmap = iconv_bmap,
-
- .flag_nopath = 1,
};
static const struct fuse_opt iconv_opts[] = {
diff --git a/lib/modules/subdir.c b/lib/modules/subdir.c
index 708edf3..9478e4e 100644
--- a/lib/modules/subdir.c
+++ b/lib/modules/subdir.c
@@ -547,6 +547,8 @@ static void *subdir_init(struct fuse_conn_info *conn,
{
struct subdir *d = subdir_get();
fuse_fs_init(d->next, conn, cfg);
+ /* Don't touch cfg->nullpath_ok, we can work with
+ either */
return d;
}
@@ -594,8 +596,6 @@ static const struct fuse_operations subdir_oper = {
.lock = subdir_lock,
.flock = subdir_flock,
.bmap = subdir_bmap,
-
- .flag_nopath = 1,
};
static const struct fuse_opt subdir_opts[] = {