Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 98199
b: refs/heads/master
c: f948d56
h: refs/heads/master
i:
  98197: 57744bb
  98195: e8be899
  98191: 9021083
v: v3
  • Loading branch information
Miklos Szeredi authored and Linus Torvalds committed Jun 18, 2008
1 parent 4c05d58 commit 339d5c2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cd50e89244087432a70598e432ff199a009b0e73
refs/heads/master: f948d56435fc1f7506f08866302ecd6e60b533dd
4 changes: 2 additions & 2 deletions trunk/fs/fuse/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 339d5c2

Please sign in to comment.