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

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

fuse: fix thinko in max I/O size calucation 



Use max not min to enforce a lower limit on the max I/O size.

This bug was introduced by "fuse: fix max i/o size calculation" (commit
e5d9a0df).

Thanks to Brian Wang for noticing.

Reported-by: default avatarBrian Wang <ywang221@hotmail.com>
Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
Acked-by: default avatarSzabolcs Szakacsits <szaka@ntfs-3g.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent cd50e892

fs/fuse/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -591,7 +591,7 @@ static void process_init_reply(struct fuse_conn *fc, struct fuse_req *req) 
		fc->bdi.ra_pages = min(fc->bdi.ra_pages, ra_pages);

		fc->minor = arg->minor;

		fc->max_write = arg->minor < 5 ? 4096 : arg->max_write;

		fc->max_write = min_t(unsigned, 4096, fc->max_write);

		fc->max_write = max_t(unsigned, 4096, fc->max_write);

		fc->conn_init = 1;

	}

	fuse_put_request(fc, req);
@@ -667,7 +667,7 @@ static int fuse_fill_super(struct super_block *sb, void *data, int silent) 
	fc->flags = d.flags;

	fc->user_id = d.user_id;

	fc->group_id = d.group_id;

	fc->max_read = min_t(unsigned, 4096, d.max_read);

	fc->max_read = max_t(unsigned, 4096, d.max_read);



	/* Used by get_root_inode() */

	sb->s_fs_info = fc;