diff options
author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2007-10-17 02:25:46 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 11:42:45 -0400 |
commit | e0bf68ddec4f4f90e5871404be4f1854c17f3120 (patch) | |
tree | 36203a3558cbe26d698bed18be69b3822fb5eef2 /fs/fuse/inode.c | |
parent | dc62a30e274d003a4d08fb888f1520add4b21373 (diff) |
mm: bdi init hooks
provide BDI constructor/destructor hooks
[akpm@linux-foundation.org: compile fix]
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/fuse/inode.c')
-rw-r--r-- | fs/fuse/inode.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index 5448f625ab56..ca30b6ac03f0 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c | |||
@@ -401,6 +401,7 @@ static int fuse_show_options(struct seq_file *m, struct vfsmount *mnt) | |||
401 | static struct fuse_conn *new_conn(void) | 401 | static struct fuse_conn *new_conn(void) |
402 | { | 402 | { |
403 | struct fuse_conn *fc; | 403 | struct fuse_conn *fc; |
404 | int err; | ||
404 | 405 | ||
405 | fc = kzalloc(sizeof(*fc), GFP_KERNEL); | 406 | fc = kzalloc(sizeof(*fc), GFP_KERNEL); |
406 | if (fc) { | 407 | if (fc) { |
@@ -416,10 +417,17 @@ static struct fuse_conn *new_conn(void) | |||
416 | atomic_set(&fc->num_waiting, 0); | 417 | atomic_set(&fc->num_waiting, 0); |
417 | fc->bdi.ra_pages = (VM_MAX_READAHEAD * 1024) / PAGE_CACHE_SIZE; | 418 | fc->bdi.ra_pages = (VM_MAX_READAHEAD * 1024) / PAGE_CACHE_SIZE; |
418 | fc->bdi.unplug_io_fn = default_unplug_io_fn; | 419 | fc->bdi.unplug_io_fn = default_unplug_io_fn; |
420 | err = bdi_init(&fc->bdi); | ||
421 | if (err) { | ||
422 | kfree(fc); | ||
423 | fc = NULL; | ||
424 | goto out; | ||
425 | } | ||
419 | fc->reqctr = 0; | 426 | fc->reqctr = 0; |
420 | fc->blocked = 1; | 427 | fc->blocked = 1; |
421 | get_random_bytes(&fc->scramble_key, sizeof(fc->scramble_key)); | 428 | get_random_bytes(&fc->scramble_key, sizeof(fc->scramble_key)); |
422 | } | 429 | } |
430 | out: | ||
423 | return fc; | 431 | return fc; |
424 | } | 432 | } |
425 | 433 | ||
@@ -429,6 +437,7 @@ void fuse_conn_put(struct fuse_conn *fc) | |||
429 | if (fc->destroy_req) | 437 | if (fc->destroy_req) |
430 | fuse_request_free(fc->destroy_req); | 438 | fuse_request_free(fc->destroy_req); |
431 | mutex_destroy(&fc->inst_mutex); | 439 | mutex_destroy(&fc->inst_mutex); |
440 | bdi_destroy(&fc->bdi); | ||
432 | kfree(fc); | 441 | kfree(fc); |
433 | } | 442 | } |
434 | } | 443 | } |