Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1875dba authored by Miklos Szeredi's avatar Miklos Szeredi Committed by Linus Torvalds
Browse files

mount options: fix fuse 



Add blksize= option to /proc/mounts for fuseblk filesystems.

Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c1fca3b6

fs/fuse/inode.c

+6 −1
Original line number Diff line number Diff line
@@ -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;

}