← Back to branch summary

~ubuntu-branches/ubuntu/maverick/fuse/maverick-proposed

« back to all changes in this revision

Viewing changes to kernel/dev.c

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2007-11-22 17:01:50 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20071122170150-t5a2s8it5mecz4hl
Tags: 2.7.1-1ubuntu1
* Resynchronise with Debian. Remaining changes:
  - Don't install the init script; install the udev rule and the module
    configuration file instead.
  - debian/45-fuse.rules: set /dev/fuse group to fuse.
  - debian/fuse-utils.modprobe: module configuration file that mounts the
    control filesystem when fuse is loaded and unmounts it when fuse is
    unloaded, along with checking that the control FS is mounting before
    unmounting it.
  - debian/fuse-utils.install: add the udev rule, the module configuration
    file, and ulockmgr_server.
  - Load fuse on install, and set it so it gets loaded on reboot.
  - Move fusermount and ulockmgr_server to /bin and associated libraries
    to /lib.
  - Create libfuse2-udeb and fuse-utils-udeb.
  - Copy /sbin/mount.fuse and the fuse kernel module into the initramfs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
kernel/dev.c
131
131
        struct fuse_file *ff = file->private_data;
132
132
 
133
133
        do {
134
 
                wait_event(fc->blocked_waitq, ff->reserved_req);
 
134
                wait_event(fc->reserved_req_waitq, ff->reserved_req);
135
135
                spin_lock(&fc->lock);
136
136
                if (ff->reserved_req) {
137
137
                        req = ff->reserved_req;
157
157
        fuse_request_init(req);
158
158
        BUG_ON(ff->reserved_req);
159
159
        ff->reserved_req = req;
160
 
        wake_up(&fc->blocked_waitq);
 
160
        wake_up_all(&fc->reserved_req_waitq);
161
161
        spin_unlock(&fc->lock);
162
162
        fput(file);
163
163
}
1093
1093
int __init fuse_dev_init(void)
1094
1094
{
1095
1095
        int err = -ENOMEM;
 
1096
#ifdef KERNEL_2_6_23_PLUS
 
1097
        fuse_req_cachep = kmem_cache_create("fuse_request",
 
1098
                                            sizeof(struct fuse_req),
 
1099
                                            0, 0, NULL);
 
1100
#else
1096
1101
        fuse_req_cachep = kmem_cache_create("fuse_request",
1097
1102
                                            sizeof(struct fuse_req),
1098
1103
                                            0, 0, NULL, NULL);
 
1104
#endif
1099
1105
        if (!fuse_req_cachep)
1100
1106
                goto out;
1101
1107