diff options
Diffstat (limited to 'fs/fuse/inode.c')
-rw-r--r-- | fs/fuse/inode.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index 7d01c68852a8..0cef5ea319f3 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c | |||
@@ -584,6 +584,7 @@ static void process_init_reply(struct fuse_conn *fc, struct fuse_req *req) | |||
584 | fc->bdi.ra_pages = min(fc->bdi.ra_pages, ra_pages); | 584 | fc->bdi.ra_pages = min(fc->bdi.ra_pages, ra_pages); |
585 | fc->minor = arg->minor; | 585 | fc->minor = arg->minor; |
586 | fc->max_write = arg->minor < 5 ? 4096 : arg->max_write; | 586 | fc->max_write = arg->minor < 5 ? 4096 : arg->max_write; |
587 | fc->max_write = min_t(unsigned, 4096, fc->max_write); | ||
587 | fc->conn_init = 1; | 588 | fc->conn_init = 1; |
588 | } | 589 | } |
589 | fuse_put_request(fc, req); | 590 | fuse_put_request(fc, req); |
@@ -658,7 +659,7 @@ static int fuse_fill_super(struct super_block *sb, void *data, int silent) | |||
658 | fc->flags = d.flags; | 659 | fc->flags = d.flags; |
659 | fc->user_id = d.user_id; | 660 | fc->user_id = d.user_id; |
660 | fc->group_id = d.group_id; | 661 | fc->group_id = d.group_id; |
661 | fc->max_read = d.max_read; | 662 | fc->max_read = min_t(unsigned, 4096, d.max_read); |
662 | 663 | ||
663 | /* Used by get_root_inode() */ | 664 | /* Used by get_root_inode() */ |
664 | sb->s_fs_info = fc; | 665 | sb->s_fs_info = fc; |