diff options
author | Miklos Szeredi <mszeredi@suse.cz> | 2008-02-08 07:21:43 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 12:22:40 -0500 |
commit | d1875dbaa58e4894f7d9321d1c280fb23ca9f9e5 (patch) | |
tree | dffcd7b60e50a1bcd112795e2a438c254b12f870 /fs | |
parent | c1fca3b6090f45018b3754eff0276521edb8ac3e (diff) |
mount options: fix fuse
Add blksize= option to /proc/mounts for fuseblk filesystems.
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/fuse/inode.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index 574707409bbf..033f7bdd47e8 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c | |||
@@ -29,6 +29,8 @@ DEFINE_MUTEX(fuse_mutex); | |||
29 | 29 | ||
30 | #define FUSE_SUPER_MAGIC 0x65735546 | 30 | #define FUSE_SUPER_MAGIC 0x65735546 |
31 | 31 | ||
32 | #define FUSE_DEFAULT_BLKSIZE 512 | ||
33 | |||
32 | struct fuse_mount_data { | 34 | struct fuse_mount_data { |
33 | int fd; | 35 | int fd; |
34 | unsigned rootmode; | 36 | unsigned rootmode; |
@@ -355,7 +357,7 @@ static int parse_fuse_opt(char *opt, struct fuse_mount_data *d, int is_bdev) | |||
355 | char *p; | 357 | char *p; |
356 | memset(d, 0, sizeof(struct fuse_mount_data)); | 358 | memset(d, 0, sizeof(struct fuse_mount_data)); |
357 | d->max_read = ~0; | 359 | d->max_read = ~0; |
358 | d->blksize = 512; | 360 | d->blksize = FUSE_DEFAULT_BLKSIZE; |
359 | 361 | ||
360 | while ((p = strsep(&opt, ",")) != NULL) { | 362 | while ((p = strsep(&opt, ",")) != NULL) { |
361 | int token; | 363 | int token; |
@@ -440,6 +442,9 @@ static int fuse_show_options(struct seq_file *m, struct vfsmount *mnt) | |||
440 | seq_puts(m, ",allow_other"); | 442 | seq_puts(m, ",allow_other"); |
441 | if (fc->max_read != ~0) | 443 | if (fc->max_read != ~0) |
442 | seq_printf(m, ",max_read=%u", fc->max_read); | 444 | seq_printf(m, ",max_read=%u", fc->max_read); |
445 | if (mnt->mnt_sb->s_bdev && | ||
446 | mnt->mnt_sb->s_blocksize != FUSE_DEFAULT_BLKSIZE) | ||
447 | seq_printf(m, ",blksize=%lu", mnt->mnt_sb->s_blocksize); | ||
443 | return 0; | 448 | return 0; |
444 | } | 449 | } |
445 | 450 | ||