aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-28 15:13:00 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-28 15:13:00 -0400
commitf063a0c0c995d010960efcc1b2ed14b99674f25c (patch)
tree106e30acd1a58b3cf9f3c15abe1de83f1919e03b /Documentation
parent3c3762957818dc902222733a8184f23102e24472 (diff)
parent5af634789c93b97cfb314a102436716be8fbc577 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (841 commits) Staging: brcm80211: fix usage of roundup in structures Staging: bcm: fix up network device reference counting Staging: keucr: fix up US_ macro change staging: brcm80211: brcmfmac: Removed codeversion from firmware filenames. staging: brcm80211: Remove unnecessary header files. staging: brcm80211: Remove unnecessary includes from bcmutils.c staging: brcm80211: Removed unnecessary pktsetprio() function. Staging: brcm80211: remove typedefs.h Staging: brcm80211: remove uintptr typedef usage Staging: hv: remove struct vmbus_channel_interface Staging: hv: remove Open from struct vmbus_channel_interface Staging: hv: storvsc: call vmbus_open directly Staging: hv: netvsc: call vmbus_open directly Staging: hv: channel: export vmbus_open to modules Staging: hv: remove Close from struct vmbus_channel_interface Staging: hv: netvsc: call vmbus_close directly Staging: hv: storvsc: call vmbus_close directly Staging: hv: channel: export vmbus_close to modules Staging: hv: remove SendPacket from struct vmbus_channel_interface Staging: hv: storvsc: call vmbus_sendpacket directly ... Fix up conflicts in drivers/staging/cx25821/cx25821-audio-upstream.c drivers/staging/cx25821/cx25821-audio.h due to warring whitespace cleanups (neither of which were all that great)
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/ABI/testing/sysfs-block-zram99
-rw-r--r--Documentation/filesystems/00-INDEX2
-rw-r--r--Documentation/filesystems/smbfs.txt8
-rw-r--r--Documentation/ioctl/ioctl-number.txt2
4 files changed, 100 insertions, 11 deletions
diff --git a/Documentation/ABI/testing/sysfs-block-zram b/Documentation/ABI/testing/sysfs-block-zram
new file mode 100644
index 00000000000..c8b3b48ec62
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-block-zram
@@ -0,0 +1,99 @@
1What: /sys/block/zram<id>/disksize
2Date: August 2010
3Contact: Nitin Gupta <ngupta@vflare.org>
4Description:
5 The disksize file is read-write and specifies the disk size
6 which represents the limit on the *uncompressed* worth of data
7 that can be stored in this disk.
8
9What: /sys/block/zram<id>/initstate
10Date: August 2010
11Contact: Nitin Gupta <ngupta@vflare.org>
12Description:
13 The disksize file is read-only and shows the initialization
14 state of the device.
15
16What: /sys/block/zram<id>/reset
17Date: August 2010
18Contact: Nitin Gupta <ngupta@vflare.org>
19Description:
20 The disksize file is write-only and allows resetting the
21 device. The reset operation frees all the memory assocaited
22 with this device.
23
24What: /sys/block/zram<id>/num_reads
25Date: August 2010
26Contact: Nitin Gupta <ngupta@vflare.org>
27Description:
28 The num_reads file is read-only and specifies the number of
29 reads (failed or successful) done on this device.
30
31What: /sys/block/zram<id>/num_writes
32Date: August 2010
33Contact: Nitin Gupta <ngupta@vflare.org>
34Description:
35 The num_writes file is read-only and specifies the number of
36 writes (failed or successful) done on this device.
37
38What: /sys/block/zram<id>/invalid_io
39Date: August 2010
40Contact: Nitin Gupta <ngupta@vflare.org>
41Description:
42 The invalid_io file is read-only and specifies the number of
43 non-page-size-aligned I/O requests issued to this device.
44
45What: /sys/block/zram<id>/notify_free
46Date: August 2010
47Contact: Nitin Gupta <ngupta@vflare.org>
48Description:
49 The notify_free file is read-only and specifies the number of
50 swap slot free notifications received by this device. These
51 notifications are send to a swap block device when a swap slot
52 is freed. This statistic is applicable only when this disk is
53 being used as a swap disk.
54
55What: /sys/block/zram<id>/discard
56Date: August 2010
57Contact: Nitin Gupta <ngupta@vflare.org>
58Description:
59 The discard file is read-only and specifies the number of
60 discard requests received by this device. These requests
61 provide information to block device regarding blocks which are
62 no longer used by filesystem.
63
64What: /sys/block/zram<id>/zero_pages
65Date: August 2010
66Contact: Nitin Gupta <ngupta@vflare.org>
67Description:
68 The zero_pages file is read-only and specifies number of zero
69 filled pages written to this disk. No memory is allocated for
70 such pages.
71
72What: /sys/block/zram<id>/orig_data_size
73Date: August 2010
74Contact: Nitin Gupta <ngupta@vflare.org>
75Description:
76 The orig_data_size file is read-only and specifies uncompressed
77 size of data stored in this disk. This excludes zero-filled
78 pages (zero_pages) since no memory is allocated for them.
79 Unit: bytes
80
81What: /sys/block/zram<id>/compr_data_size
82Date: August 2010
83Contact: Nitin Gupta <ngupta@vflare.org>
84Description:
85 The compr_data_size file is read-only and specifies compressed
86 size of data stored in this disk. So, compression ratio can be
87 calculated using orig_data_size and this statistic.
88 Unit: bytes
89
90What: /sys/block/zram<id>/mem_used_total
91Date: August 2010
92Contact: Nitin Gupta <ngupta@vflare.org>
93Description:
94 The mem_used_total file is read-only and specifies the amount
95 of memory, including allocator fragmentation and metadata
96 overhead, allocated for this disk. So, allocator space
97 efficiency can be calculated using compr_data_size and this
98 statistic.
99 Unit: bytes \ No newline at end of file
diff --git a/Documentation/filesystems/00-INDEX b/Documentation/filesystems/00-INDEX
index 4303614b5ad..8c624a18f67 100644
--- a/Documentation/filesystems/00-INDEX
+++ b/Documentation/filesystems/00-INDEX
@@ -96,8 +96,6 @@ seq_file.txt
96 - how to use the seq_file API 96 - how to use the seq_file API
97sharedsubtree.txt 97sharedsubtree.txt
98 - a description of shared subtrees for namespaces. 98 - a description of shared subtrees for namespaces.
99smbfs.txt
100 - info on using filesystems with the SMB protocol (Win 3.11 and NT).
101spufs.txt 99spufs.txt
102 - info and mount options for the SPU filesystem used on Cell. 100 - info and mount options for the SPU filesystem used on Cell.
103sysfs-pci.txt 101sysfs-pci.txt
diff --git a/Documentation/filesystems/smbfs.txt b/Documentation/filesystems/smbfs.txt
deleted file mode 100644
index 194fb0decd2..00000000000
--- a/Documentation/filesystems/smbfs.txt
+++ /dev/null
@@ -1,8 +0,0 @@
1Smbfs is a filesystem that implements the SMB protocol, which is the
2protocol used by Windows for Workgroups, Windows 95 and Windows NT.
3Smbfs was inspired by Samba, the program written by Andrew Tridgell
4that turns any Unix host into a file server for DOS or Windows clients.
5
6Smbfs is a SMB client, but uses parts of samba for its operation. For
7more info on samba, including documentation, please go to
8http://www.samba.org/ and then on to your nearest mirror.
diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt
index 10f5af8b73f..63ffd78824d 100644
--- a/Documentation/ioctl/ioctl-number.txt
+++ b/Documentation/ioctl/ioctl-number.txt
@@ -259,7 +259,7 @@ Code Seq#(hex) Include File Comments
259't' 00-7F linux/if_ppp.h 259't' 00-7F linux/if_ppp.h
260't' 80-8F linux/isdn_ppp.h 260't' 80-8F linux/isdn_ppp.h
261't' 90 linux/toshiba.h 261't' 90 linux/toshiba.h
262'u' 00-1F linux/smb_fs.h 262'u' 00-1F linux/smb_fs.h gone
263'v' all linux/videodev.h conflict! 263'v' all linux/videodev.h conflict!
264'v' 00-1F linux/ext2_fs.h conflict! 264'v' 00-1F linux/ext2_fs.h conflict!
265'v' 00-1F linux/fs.h conflict! 265'v' 00-1F linux/fs.h conflict!