summaryrefslogtreecommitdiffstats
path: root/glusterfsd
diff options
context:
space:
mode:
authorAnand V. Avati <avati@dev.gluster.com>2009-08-17 15:25:44 -0700
committerAnand V. Avati <avati@dev.gluster.com>2009-08-17 15:25:44 -0700
commita31b0016347b3bc9b341fa0f4541ed137224f593 (patch)
tree3e1faf06a3e14e5022048886ecfa49267c92c986 /glusterfsd
parent862cbb38375f0176582b06019ba406818d236828 (diff)
parent10824751f8669e7c39ebd46ab698ed0abd4e5165 (diff)
Merge branch 'fusilli' of /data/git/users/csaba/glusterfs-fusilli
Conflicts: xlators/mount/fuse/src/fuse-bridge.c
Diffstat (limited to 'glusterfsd')
-rw-r--r--glusterfsd/src/glusterfsd.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c
index 8995613..3c9e778 100644
--- a/glusterfsd/src/glusterfsd.c
+++ b/glusterfsd/src/glusterfsd.c
@@ -140,7 +140,8 @@ static struct argp_option gf_options[] = {
{0, 0, 0, 0, "Fuse options:"},
{"disable-direct-io-mode", ARGP_DISABLE_DIRECT_IO_MODE_KEY, 0, 0,
- "Disable direct I/O mode in fuse kernel module"},
+ "Disable direct I/O mode in fuse kernel module"
+ " [default if big writes are supported]"},
{"entry-timeout", ARGP_ENTRY_TIMEOUT_KEY, "SECONDS", 0,
"Set entry timeout to SECONDS in fuse kernel module [default: 1]"},
{"attribute-timeout", ARGP_ATTRIBUTE_TIMEOUT_KEY, "SECONDS", 0,