git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[IRDA]: Fix rfcomm use-after-free
[pandora-kernel.git]
/
block
/
ioctl.c
diff --git
a/block/ioctl.c
b/block/ioctl.c
index
f6962b6
..
f7e3e8a
100644
(file)
--- a/
block/ioctl.c
+++ b/
block/ioctl.c
@@
-61,7
+61,7
@@
static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user
}
}
/* all seems OK */
}
}
/* all seems OK */
- add_partition(disk, part, start, length);
+ add_partition(disk, part, start, length
, ADDPART_FLAG_NONE
);
mutex_unlock(&bdev->bd_mutex);
return 0;
case BLKPG_DEL_PARTITION:
mutex_unlock(&bdev->bd_mutex);
return 0;
case BLKPG_DEL_PARTITION:
@@
-80,9
+80,9
@@
static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user
}
/* all seems OK */
fsync_bdev(bdevp);
}
/* all seems OK */
fsync_bdev(bdevp);
- invalidate_bdev(bdevp
, 0
);
+ invalidate_bdev(bdevp);
- mutex_lock
(&bdev->bd_mutex
);
+ mutex_lock
_nested(&bdev->bd_mutex, 1
);
delete_partition(disk, part);
mutex_unlock(&bdev->bd_mutex);
mutex_unlock(&bdevp->bd_mutex);
delete_partition(disk, part);
mutex_unlock(&bdev->bd_mutex);
mutex_unlock(&bdevp->bd_mutex);
@@
-236,7
+236,7
@@
int blkdev_ioctl(struct inode *inode, struct file *file, unsigned cmd,
lock_kernel();
fsync_bdev(bdev);
lock_kernel();
fsync_bdev(bdev);
- invalidate_bdev(bdev
, 0
);
+ invalidate_bdev(bdev);
unlock_kernel();
return 0;
unlock_kernel();
return 0;