Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26e20a10 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge commit 'v2.6.37-rc7' into x86/security

parents 691513f7 90a8a73c
Loading
Loading
Loading
Loading
+83 −0
Original line number Original line Diff line number Diff line
What:		/sys/bus/rbd/
Date:		November 2010
Contact:	Yehuda Sadeh <yehuda@hq.newdream.net>,
		Sage Weil <sage@newdream.net>
Description:

Being used for adding and removing rbd block devices.

Usage: <mon ip addr> <options> <pool name> <rbd image name> [snap name]

 $ echo "192.168.0.1 name=admin rbd foo" > /sys/bus/rbd/add

The snapshot name can be "-" or omitted to map the image read/write. A <dev-id>
will be assigned for any registered block device. If snapshot is used, it will
be mapped read-only.

Removal of a device:

  $ echo <dev-id> > /sys/bus/rbd/remove

Entries under /sys/bus/rbd/devices/<dev-id>/
--------------------------------------------

client_id

	The ceph unique client id that was assigned for this specific session.

major

	The block device major number.

name

	The name of the rbd image.

pool

	The pool where this rbd image resides. The pool-name pair is unique
	per rados system.

size

	The size (in bytes) of the mapped block device.

refresh

	Writing to this file will reread the image header data and set
	all relevant datastructures accordingly.

current_snap

	The current snapshot for which the device is mapped.

create_snap

	Create a snapshot:

	 $ echo <snap-name> > /sys/bus/rbd/devices/<dev-id>/snap_create

rollback_snap

	Rolls back data to the specified snapshot. This goes over the entire
	list of rados blocks and sends a rollback command to each.

	 $ echo <snap-name> > /sys/bus/rbd/devices/<dev-id>/snap_rollback

snap_*

	A directory per each snapshot


Entries under /sys/bus/rbd/devices/<dev-id>/snap_<snap-name>
-------------------------------------------------------------

id

	The rados internal snapshot id assigned for this snapshot

size

	The size of the image when this snapshot was taken.

+15 −1
Original line number Original line Diff line number Diff line
@@ -47,6 +47,20 @@ Date: January 2007
KernelVersion:	2.6.20
KernelVersion:	2.6.20
Contact:	"Corentin Chary" <corentincj@iksaif.net>
Contact:	"Corentin Chary" <corentincj@iksaif.net>
Description:
Description:
		Control the bluetooth device. 1 means on, 0 means off.
		Control the wlan device. 1 means on, 0 means off.
		This may control the led, the device or both.
		This may control the led, the device or both.
Users:		Lapsus
Users:		Lapsus

What:		/sys/devices/platform/asus_laptop/wimax
Date:		October 2010
KernelVersion:	2.6.37
Contact:	"Corentin Chary" <corentincj@iksaif.net>
Description:
		Control the wimax device. 1 means on, 0 means off.

What:		/sys/devices/platform/asus_laptop/wwan
Date:		October 2010
KernelVersion:	2.6.37
Contact:	"Corentin Chary" <corentincj@iksaif.net>
Description:
		Control the wwan (3G) device. 1 means on, 0 means off.
+10 −0
Original line number Original line Diff line number Diff line
What:		/sys/devices/platform/eeepc-wmi/cpufv
Date:		Oct 2010
KernelVersion:	2.6.37
Contact:	"Corentin Chary" <corentincj@iksaif.net>
Description:
		Change CPU clock configuration (write-only).
		There are three available clock configuration:
		    * 0 -> Super Performance Mode
		    * 1 -> High Performance Mode
		    * 2 -> Power Saving Mode
+0 −4
Original line number Original line Diff line number Diff line
@@ -79,10 +79,6 @@
      </sect2>
      </sect2>
    </sect1>
    </sect1>
  </chapter>
  </chapter>
  <chapter id="clk">
    <title>Clock Framework Extensions</title>
!Iinclude/linux/sh_clk.h
  </chapter>
  <chapter id="mach">
  <chapter id="mach">
    <title>Machine Specific Interfaces</title>
    <title>Machine Specific Interfaces</title>
    <sect1 id="dreamcast">
    <sect1 id="dreamcast">
+3 −3
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@
	</orgname>
	</orgname>


	<address>
	<address>
	   <email>hjk@linutronix.de</email>
	   <email>hjk@hansjkoch.de</email>
	</address>
	</address>
    </affiliation>
    </affiliation>
</author>
</author>
@@ -114,7 +114,7 @@ GPL version 2.


<para>If you know of any translations for this document, or you are
<para>If you know of any translations for this document, or you are
interested in translating it, please email me
interested in translating it, please email me
<email>hjk@linutronix.de</email>.
<email>hjk@hansjkoch.de</email>.
</para>
</para>
</sect1>
</sect1>


@@ -171,7 +171,7 @@ interested in translating it, please email me
<title>Feedback</title>
<title>Feedback</title>
	<para>Find something wrong with this document? (Or perhaps something
	<para>Find something wrong with this document? (Or perhaps something
	right?) I would love to hear from you. Please email me at
	right?) I would love to hear from you. Please email me at
	<email>hjk@linutronix.de</email>.</para>
	<email>hjk@hansjkoch.de</email>.</para>
</sect1>
</sect1>
</chapter>
</chapter>


Loading