Attachment #81094 for bug #124610

View | Details | Raw Unified | Return to bug 124610
Collapse All | Expand All




	if (!access_ok(VERIFY_READ, buf, size))
		return -EFAULT;

	mutex_lock(&inode->i_mutex);
	if (file->f_flags & O_DIRECT)
		count = walk_vm(file, (char *)buf, size, offset, do_write_direct);
	else
		count = walk_vm(file, (char *)buf, size, offset, do_write_buf);
	mutex_unlock(&inode->i_mutex);

	return count;
}





		sb->s_flags = flags;
		strlcpy(sb->s_id, bdevname(real, buf), sizeof(sb->s_id));
		sb_set_blocksize(sb, block_size(real));
		sync_blockdev(real);
		set_blocksize(real, sb->s_old_blocksize);
		error = fill_super(sb, data, (flags & MS_VERBOSE) ? 1 : 0);
		if (error) {
			up_write(&sb->s_umount);

{
	struct block_device *diaper = sb->s_bdev;
	struct block_device *real = gfs_diaper_2real(diaper);
	unsigned long bsize = sb->s_old_blocksize;

	generic_shutdown_super(sb);
	sync_blockdev(diaper);
	sync_blockdev(real);
	gfs_diaper_put(diaper);
	close_bdev_excl(real);
}

Return to bug 124610

Lines 931-942 Link Here

(-)cluster-1.01.00.orig/gfs-kernel/src/gfs/ops_file.c (-2 / +2 lines)
931	if (!access_ok(VERIFY_READ, buf, size))	931	if (!access_ok(VERIFY_READ, buf, size))
932	return -EFAULT;	932	return -EFAULT;
933		933
934	down(&inode->i_sem);	934	mutex_lock(&inode->i_mutex);
935	if (file->f_flags & O_DIRECT)	935	if (file->f_flags & O_DIRECT)
936	count = walk_vm(file, (char *)buf, size, offset, do_write_direct);	936	count = walk_vm(file, (char *)buf, size, offset, do_write_direct);
937	else	937	else
938	count = walk_vm(file, (char *)buf, size, offset, do_write_buf);	938	count = walk_vm(file, (char *)buf, size, offset, do_write_buf);
939	up(&inode->i_sem);	939	mutex_unlock(&inode->i_mutex);
940		940
941	return count;	941	return count;
942	}	942	}

Lines 715-723 Link Here

(-)cluster-1.01.00.orig/gfs-kernel/src/gfs/ops_fstype.c (-6 / +4 lines)
715		715
716	sb->s_flags = flags;	716	sb->s_flags = flags;
717	strlcpy(sb->s_id, bdevname(real, buf), sizeof(sb->s_id));	717	strlcpy(sb->s_id, bdevname(real, buf), sizeof(sb->s_id));
718	sb->s_old_blocksize = block_size(real);	718	sb_set_blocksize(sb, block_size(real));
719	sb_set_blocksize(sb, sb->s_old_blocksize);	719	sync_blockdev(real);
720	set_blocksize(real, sb->s_old_blocksize);
721	error = fill_super(sb, data, (flags & MS_VERBOSE) ? 1 : 0);	720	error = fill_super(sb, data, (flags & MS_VERBOSE) ? 1 : 0);
722	if (error) {	721	if (error) {
723	up_write(&sb->s_umount);	722	up_write(&sb->s_umount);
Lines 748-758 Link Here
748	{	747	{
749	struct block_device *diaper = sb->s_bdev;	748	struct block_device *diaper = sb->s_bdev;
750	struct block_device *real = gfs_diaper_2real(diaper);	749	struct block_device *real = gfs_diaper_2real(diaper);
751	unsigned long bsize = sb->s_old_blocksize;
752		750
753	generic_shutdown_super(sb);	751	generic_shutdown_super(sb);
754	set_blocksize(diaper, bsize);	752	sync_blockdev(diaper);
755	set_blocksize(real, bsize);	753	sync_blockdev(real);
756	gfs_diaper_put(diaper);	754	gfs_diaper_put(diaper);
757	close_bdev_excl(real);	755	close_bdev_excl(real);
758	}	756	}