projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[firefly-linux-kernel-4.4.55.git]
/
fs
/
block_dev.c
diff --git
a/fs/block_dev.c
b/fs/block_dev.c
index fc7028b685f29ab94d5db4ef26dbb897573c6af5..575076c018f4789c3c5f313f56b7b09674604baf 100644
(file)
--- a/
fs/block_dev.c
+++ b/
fs/block_dev.c
@@
-489,7
+489,7
@@
static void bdev_clear_inode(struct inode *inode)
spin_unlock(&bdev_lock);
}
spin_unlock(&bdev_lock);
}
-static struct super_operations bdev_sops = {
+static
const
struct super_operations bdev_sops = {
.statfs = simple_statfs,
.alloc_inode = bdev_alloc_inode,
.destroy_inode = bdev_destroy_inode,
.statfs = simple_statfs,
.alloc_inode = bdev_alloc_inode,
.destroy_inode = bdev_destroy_inode,
@@
-1101,6
+1101,13
@@
static int __blkdev_get(struct block_device *bdev, mode_t mode, unsigned flags,
int for_part);
static int __blkdev_put(struct block_device *bdev, int for_part);
int for_part);
static int __blkdev_put(struct block_device *bdev, int for_part);
+/*
+ * bd_mutex locking:
+ *
+ * mutex_lock(part->bd_mutex)
+ * mutex_lock_nested(whole->bd_mutex, 1)
+ */
+
static int do_open(struct block_device *bdev, struct file *file, int for_part)
{
struct module *owner = NULL;
static int do_open(struct block_device *bdev, struct file *file, int for_part)
{
struct module *owner = NULL;