diff options
| author | Miklos Szeredi | 2008-06-17 18:05:40 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2008-06-18 03:08:10 +0200 |
| commit | f948d56435fc1f7506f08866302ecd6e60b533dd (patch) | |
| tree | eb729171e36e53888ed9dd7033e3dee1b2a682e0 /fs/fuse/inode.c | |
| parent | Unignore vmlinux.lds.h from Git. (diff) | |
| download | kernel-qcow2-linux-f948d56435fc1f7506f08866302ecd6e60b533dd.tar.gz kernel-qcow2-linux-f948d56435fc1f7506f08866302ecd6e60b533dd.tar.xz kernel-qcow2-linux-f948d56435fc1f7506f08866302ecd6e60b533dd.zip | |
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
e5d9a0df07484d6d191756878c974e4307fb24ce).
Thanks to Brian Wang for noticing.
Reported-by: Brian Wang <ywang221@hotmail.com>
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Acked-by: Szabolcs Szakacsits <szaka@ntfs-3g.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/fuse/inode.c')
| -rw-r--r-- | fs/fuse/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index 43e99513334a..3141690558c8 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c @@ -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; |