From 339d5c29e1dd2f864192ed24255c12e552f2f62a Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Tue, 17 Jun 2008 18:05:40 +0200 Subject: [PATCH] --- yaml --- r: 98199 b: refs/heads/master c: f948d56435fc1f7506f08866302ecd6e60b533dd h: refs/heads/master i: 98197: 57744bb6f428beffa683e00c60f134f696028bf7 98195: e8be89905349ac3e8b88506e2634a99d726c11d5 98191: 9021083d7f8c86839d8ed6b99779c1002e547066 v: v3 --- [refs] | 2 +- trunk/fs/fuse/inode.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2db5bb1bbabb..36c98e8687d9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd50e89244087432a70598e432ff199a009b0e73 +refs/heads/master: f948d56435fc1f7506f08866302ecd6e60b533dd diff --git a/trunk/fs/fuse/inode.c b/trunk/fs/fuse/inode.c index 43e99513334a..3141690558c8 100644 --- a/trunk/fs/fuse/inode.c +++ b/trunk/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;