git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into for-next
[sfrench/cifs-2.6.git]
/
drivers
/
block
/
rbd.c
diff --git
a/drivers/block/rbd.c
b/drivers/block/rbd.c
index 15f65b5f3fc7156c50300a6ab4d8efbe8a054e0e..fe3c3249cec4a47e7198404e0343004e457b3b2d 100644
(file)
--- a/
drivers/block/rbd.c
+++ b/
drivers/block/rbd.c
@@
-192,7
+192,7
@@
static ssize_t rbd_snap_add(struct device *dev,
const char *buf,
size_t count);
static void __rbd_remove_snap_dev(struct rbd_device *rbd_dev,
- struct rbd_snap *snap);
;
+ struct rbd_snap *snap);
static struct rbd_device *dev_to_rbd(struct device *dev)