summaryrefslogtreecommitdiffstats
path: root/include/linux/miscdevice.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-11-13 15:27:00 +0900
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-13 15:27:00 +0900
commita7fa20a594fadf1e37cb3469c880ce6a544d3c3b (patch)
tree4be4e98648ff9afa398be947ca8fa716d6701686 /include/linux/miscdevice.h
parenta30124539b2641c5b3551193af7d21a6fc61ba98 (diff)
parentce128de6260f86a990ed44a697f26d0859684f28 (diff)
downloadlinux-a7fa20a594fadf1e37cb3469c880ce6a544d3c3b.tar.gz
linux-a7fa20a594fadf1e37cb3469c880ce6a544d3c3b.tar.bz2
linux-a7fa20a594fadf1e37cb3469c880ce6a544d3c3b.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse
Pull fuse updates from Miklos Szeredi: "This adds a ->writepage() implementation to fuse, improving mmaped writeout and paving the way for buffered writeback. And there's a patch to add a fix minor number for /dev/cuse, similarly to /dev/fuse" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse: fuse: writepages: protect secondary requests from fuse file release fuse: writepages: update bdi writeout when deleting secondary request fuse: writepages: crop secondary requests fuse: writepages: roll back changes if request not found cuse: add fix minor number to /dev/cuse fuse: writepage: skip already in flight fuse: writepages: handle same page rewrites fuse: writepages: fix aggregation fuse: fix race in fuse_writepages() fuse: Implement writepages callback fuse: don't BUG on no write file fuse: lock page in mkwrite fuse: Prepare to handle multiple pages in writeback fuse: Getting file for writeback helper
Diffstat (limited to 'include/linux/miscdevice.h')
-rw-r--r--include/linux/miscdevice.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h
index cb358355ef43..f7eaf2d60083 100644
--- a/include/linux/miscdevice.h
+++ b/include/linux/miscdevice.h
@@ -31,6 +31,7 @@
#define I2O_MINOR 166
#define MICROCODE_MINOR 184
#define TUN_MINOR 200
+#define CUSE_MINOR 203
#define MWAVE_MINOR 219 /* ACP/Mwave Modem */
#define MPT_MINOR 220
#define MPT2SAS_MINOR 221