mirrors/libfuse
0
0
Fork 0
mirror of https://github.com/libfuse/libfuse.git synced 2024-11-23 12:14:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Print a more helpful message in case the kernel doesn't support the 'fuseblk' filesystem type

Browse Source
This commit is contained in:
Miklos Szeredi 2006-11-29 16:01:23 +00:00
parent fe621f9ae1
commit 04d1278867
3 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2006-11-29 Miklos Szeredi <miklos@szeredi.hu>
* fusermount: Print a more helpful message in case the kernel
doesn't support the 'fuseblk' filesystem type. This has been
biting ntfs-3g users. Reported by Yura Pakhuchiy
2006-11-19 Miklos Szeredi <miklos@szeredi.hu>
* Fix bug in certain error paths of lookup routines. The request

3
kernel/dir.c
View File

@ -1086,6 +1086,9 @@ static int fuse_setattr(struct dentry *entry, struct iattr *attr)
memset(&inarg, 0, sizeof(inarg));
iattr_to_fattr(attr, &inarg);
/* Defend against future expansion of ATTR_FILE use */
if (S_ISDIR(inode->i_mode))
inarg.valid &= ~FATTR_FH;
req->in.h.opcode = FUSE_SETATTR;
req->in.h.nodeid = get_node_id(inode);
req->in.numargs = 1;

23
util/fusermount.c
View File

@ -575,6 +575,23 @@ static int check_mountpoint_empty(const char *mnt, mode_t rootmode,
return 0;
}
static int has_fuseblk(void)
{
char buf[256];
FILE *f = fopen("/proc/filesystems", "r");
if (!f)
return 1;
while (fgets(buf, sizeof(buf), f))
if (strcmp(buf, "fuseblk\n") == 0) {
fclose(f);
return 1;
}
fclose(f);
return 0;
}
static int do_mount(const char *mnt, const char **type, mode_t rootmode,
int fd, const char *opts, const char *dev, char **fsnamep,
char **mnt_optsp, off_t rootsize)
@ -686,7 +703,11 @@ static int do_mount(const char *mnt, const char **type, mode_t rootmode,
res = mount(fsname, mnt, *type, flags, optbuf);
}
if (res == -1) {
fprintf(stderr, "%s: mount failed: %s\n", progname, strerror(errno));
int errno_save = errno;
if (blkdev && errno == ENODEV && !has_fuseblk())
fprintf(stderr, "%s: 'fuseblk' support missing; try the kernel module from fuse-2.6.0 or later\n", progname);
else
fprintf(stderr, "%s: mount failed: %s\n", progname, strerror(errno_save));
goto err;
} else {
*fsnamep = fsname;