aboutsummaryrefslogtreecommitdiffstats
path: root/fs/fuse/inode.c
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@suse.cz>2007-05-08 03:25:43 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-08 14:15:01 -0400
commit79c0b2df79eb56fc71e54c75cd7fb3acf84370f9 (patch)
treef19be816fef3565b7f9cc746786e29fee0ac62e6 /fs/fuse/inode.c
parent880afc4d76af452267174b5989943f081c1db2c0 (diff)
add filesystem subtype support
There's a slight problem with filesystem type representation in fuse based filesystems. From the kernel's view, there are just two filesystem types: fuse and fuseblk. From the user's view there are lots of different filesystem types. The user is not even much concerned if the filesystem is fuse based or not. So there's a conflict of interest in how this should be represented in fstab, mtab and /proc/mounts. The current scheme is to encode the real filesystem type in the mount source. So an sshfs mount looks like this: sshfs#user@server:/ /mnt/server fuse rw,nosuid,nodev,... This url-ish syntax works OK for sshfs and similar filesystems. However for block device based filesystems (ntfs-3g, zfs) it doesn't work, since the kernel expects the mount source to be a real device name. A possibly better scheme would be to encode the real type in the type field as "type.subtype". So fuse mounts would look like this: /dev/hda1 /mnt/windows fuseblk.ntfs-3g rw,... user@server:/ /mnt/server fuse.sshfs rw,nosuid,nodev,... This patch adds the necessary code to the kernel so that this can be correctly displayed in /proc/mounts. Signed-off-by: Miklos Szeredi <mszeredi@suse.cz> 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.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index d8003be56e05..1397018ff476 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -636,6 +636,7 @@ static int fuse_get_sb(struct file_system_type *fs_type,
636static struct file_system_type fuse_fs_type = { 636static struct file_system_type fuse_fs_type = {
637 .owner = THIS_MODULE, 637 .owner = THIS_MODULE,
638 .name = "fuse", 638 .name = "fuse",
639 .fs_flags = FS_HAS_SUBTYPE,
639 .get_sb = fuse_get_sb, 640 .get_sb = fuse_get_sb,
640 .kill_sb = kill_anon_super, 641 .kill_sb = kill_anon_super,
641}; 642};
@@ -652,6 +653,7 @@ static int fuse_get_sb_blk(struct file_system_type *fs_type,
652static struct file_system_type fuseblk_fs_type = { 653static struct file_system_type fuseblk_fs_type = {
653 .owner = THIS_MODULE, 654 .owner = THIS_MODULE,
654 .name = "fuseblk", 655 .name = "fuseblk",
656 .fs_flags = FS_HAS_SUBTYPE,
655 .get_sb = fuse_get_sb_blk, 657 .get_sb = fuse_get_sb_blk,
656 .kill_sb = kill_block_super, 658 .kill_sb = kill_block_super,
657 .fs_flags = FS_REQUIRES_DEV, 659 .fs_flags = FS_REQUIRES_DEV,