From 74d0c680039a28f0d8a50d222e32931396e7c58e Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Fri, 8 Feb 2008 04:21:43 -0800 Subject: [PATCH] --- yaml --- r: 84795 b: refs/heads/master c: d1875dbaa58e4894f7d9321d1c280fb23ca9f9e5 h: refs/heads/master i: 84793: 498f8115cabf951b602f617b0940a1bdd573c805 84791: 40302f12b227ee26890dd983b98b89f354e4d099 v: v3 --- [refs] | 2 +- trunk/fs/fuse/inode.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 21a952bd8343..225eaa528113 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c1fca3b6090f45018b3754eff0276521edb8ac3e +refs/heads/master: d1875dbaa58e4894f7d9321d1c280fb23ca9f9e5 diff --git a/trunk/fs/fuse/inode.c b/trunk/fs/fuse/inode.c index 574707409bbf..033f7bdd47e8 100644 --- a/trunk/fs/fuse/inode.c +++ b/trunk/fs/fuse/inode.c @@ -29,6 +29,8 @@ DEFINE_MUTEX(fuse_mutex); #define FUSE_SUPER_MAGIC 0x65735546 +#define FUSE_DEFAULT_BLKSIZE 512 + struct fuse_mount_data { int fd; unsigned rootmode; @@ -355,7 +357,7 @@ static int parse_fuse_opt(char *opt, struct fuse_mount_data *d, int is_bdev) char *p; memset(d, 0, sizeof(struct fuse_mount_data)); d->max_read = ~0; - d->blksize = 512; + d->blksize = FUSE_DEFAULT_BLKSIZE; while ((p = strsep(&opt, ",")) != NULL) { int token; @@ -440,6 +442,9 @@ static int fuse_show_options(struct seq_file *m, struct vfsmount *mnt) seq_puts(m, ",allow_other"); if (fc->max_read != ~0) seq_printf(m, ",max_read=%u", fc->max_read); + if (mnt->mnt_sb->s_bdev && + mnt->mnt_sb->s_blocksize != FUSE_DEFAULT_BLKSIZE) + seq_printf(m, ",blksize=%lu", mnt->mnt_sb->s_blocksize); return 0; }