mm: bdi: expose the BDI object in sysfs for FUSE

Register FUSE's backing_dev_info under sysfs with the name "fuse-MAJOR:MINOR" Make the fuse control filesystem use s_dev instead of a fuse specific ID. This makes it easier to match directories under /sys/fs/fuse/connections/ with directories under /sys/class/bdi, and with actual mounts.

Miklos Szeredi committed 18 years ago

Commit b6f2fcb1 parent fa799753 files · +18 −18Browse files

Unified · Split

3 files

fs/fuse/control.c +1 −1
fs/fuse/fuse_i.h +2 −2
fs/fuse/inode.c +15 −15

fs/fuse/control.c+1−1

@@ -117,7 +117,7 @@ int fuse_ctl_add_conn(struct fuse_conn *fc) · 116 unmodified lines
117		117
118	parent = fuse_control_sb->s_root;	118	parent = fuse_control_sb->s_root;
119	inc_nlink(parent->d_inode);	119	inc_nlink(parent->d_inode);
120	sprintf(name, "%llu", (unsigned long long) fc->id);	120	sprintf(name, "%u", fc->dev);
121	parent = fuse_ctl_add_dentry(parent, fc, name, S_IFDIR \| 0500, 2,	121	parent = fuse_ctl_add_dentry(parent, fc, name, S_IFDIR \| 0500, 2,
122	&simple_dir_inode_operations,	122	&simple_dir_inode_operations,
123	&simple_dir_operations);	123	&simple_dir_operations);

fs/fuse/fuse_i.h+2−2

@@ -390,8 +390,8 @@ struct fuse_conn { · 389 unmodified lines
390	/** Entry on the fuse_conn_list */	390	/** Entry on the fuse_conn_list */
391	struct list_head entry;	391	struct list_head entry;
392		392
393	/** Unique ID */	393	/** Device ID from super block */
394	u64 id;	394	dev_t dev;
395		395
396	/** Dentries in the control filesystem */	396	/** Dentries in the control filesystem */
397	struct dentry *ctl_dentry[FUSE_CTL_NUM_DENTRIES];	397	struct dentry *ctl_dentry[FUSE_CTL_NUM_DENTRIES];

fs/fuse/inode.c+15−15

 	return 0;
 }
-static struct fuse_conn *new_conn(void)
+static struct fuse_conn *new_conn(struct super_block *sb)
 {
 	struct fuse_conn *fc;
 	int err;
 		atomic_set(&fc->num_waiting, 0);
 		fc->bdi.ra_pages = (VM_MAX_READAHEAD * 1024) / PAGE_CACHE_SIZE;
 		fc->bdi.unplug_io_fn = default_unplug_io_fn;
+		fc->dev = sb->s_dev;
 		err = bdi_init(&fc->bdi);
-		if (err) {
+		if (err)
-			kfree(fc);
+			goto error_kfree;
-			fc = NULL;
+		err = bdi_register_dev(&fc->bdi, fc->dev);
-			goto out;
+		if (err)
-		}
+			goto error_bdi_destroy;
 		fc->reqctr = 0;
 		fc->blocked = 1;
 		fc->attr_version = 1;
 		get_random_bytes(&fc->scramble_key, sizeof(fc->scramble_key));
 	}
-out:
 	return fc;
+error_bdi_destroy:
+	bdi_destroy(&fc->bdi);
+error_kfree:
+	mutex_destroy(&fc->inst_mutex);
+	kfree(fc);
+	return NULL;
 }
 void fuse_conn_put(struct fuse_conn *fc)
 	request_send_background(fc, req);
 }
-static u64 conn_id(void)
-{
-	static u64 ctr = 1;
-	return ctr++;
-}
 static int fuse_fill_super(struct super_block *sb, void *data, int silent)
 {
 	struct fuse_conn *fc;
 	if (file->f_op != &fuse_dev_operations)
 		return -EINVAL;
-	fc = new_conn();
+	fc = new_conn(sb);
 	if (!fc)
 		return -ENOMEM;
 	if (file->private_data)
 		goto err_unlock;
-	fc->id = conn_id();
 	err = fuse_ctl_add_conn(fc);
 	if (err)
 		goto err_unlock;

mm: bdi: expose the BDI object in sysfs for FUSE

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code