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

Commit d2e7ad19 authored by James Morris's avatar James Morris
Browse files

Merge branch 'master' into next 



Conflicts:
	security/smack/smack_lsm.c

Verified and added fix by Stephen Rothwell <sfr@canb.auug.org.au>
Ok'd by Casey Schaufler <casey@schaufler-ca.com>

Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parents d03a5d88 0c21e3aa

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -105,3 +105,4 @@ Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de> 
Uwe Kleine-König <ukl@pengutronix.de>

Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>

Valdis Kletnieks <Valdis.Kletnieks@vt.edu>

Takashi YOSHII <takashi.yoshii.zj@renesas.com>

CREDITS

+0 −2
Original line number Diff line number Diff line
@@ -2365,8 +2365,6 @@ E: acme@redhat.com 
W: http://oops.ghostprotocols.net:81/blog/

P: 1024D/9224DF01 D5DF E3BB E3C8 BCBB F8AD  841A B6AB 4681 9224 DF01

D: IPX, LLC, DCCP, cyc2x, wl3501_cs, net/ hacks

S: R. Brasílio Itiberê, 4270/1010 - Água Verde

S: 80240-060 - Curitiba - Paraná

S: Brazil



N: Karsten Merker

Documentation/ABI/testing/sysfs-bus-rbd

0 → 100644
+83 −0
Original line number 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.

Documentation/ABI/testing/sysfs-class-net-batman-adv

0 → 100644
+14 −0
Original line number Diff line number Diff line 


What:           /sys/class/net/<iface>/batman-adv/mesh_iface

Date:           May 2010

Contact:        Marek Lindner <lindner_marek@yahoo.de>

Description:

                The /sys/class/net/<iface>/batman-adv/mesh_iface file

                displays the batman mesh interface this <iface>

                currently is associated with.



What:           /sys/class/net/<iface>/batman-adv/iface_status

Date:           May 2010

Contact:        Marek Lindner <lindner_marek@yahoo.de>

Description:

                Indicates the status of <iface> as it is seen by batman.

Documentation/ABI/testing/sysfs-class-net-mesh

0 → 100644
+69 −0
Original line number Diff line number Diff line 


What:           /sys/class/net/<mesh_iface>/mesh/aggregated_ogms

Date:           May 2010

Contact:        Marek Lindner <lindner_marek@yahoo.de>

Description:

                Indicates whether the batman protocol messages of the

                mesh <mesh_iface> shall be aggregated or not.



What:           /sys/class/net/<mesh_iface>/mesh/bonding

Date:           June 2010

Contact:        Simon Wunderlich <siwu@hrz.tu-chemnitz.de>

Description:

                Indicates whether the data traffic going through the

                mesh will be sent using multiple interfaces at the

                same time (if available).



What:           /sys/class/net/<mesh_iface>/mesh/fragmentation

Date:           October 2010

Contact:        Andreas Langer <an.langer@gmx.de>

Description:

                Indicates whether the data traffic going through the

                mesh will be fragmented or silently discarded if the

                packet size exceeds the outgoing interface MTU.



What:           /sys/class/net/<mesh_iface>/mesh/gw_bandwidth

Date:           October 2010

Contact:        Marek Lindner <lindner_marek@yahoo.de>

Description:

                Defines the bandwidth which is propagated by this

                node if gw_mode was set to 'server'.



What:           /sys/class/net/<mesh_iface>/mesh/gw_mode

Date:           October 2010

Contact:        Marek Lindner <lindner_marek@yahoo.de>

Description:

                Defines the state of the gateway features. Can be

                either 'off', 'client' or 'server'.



What:           /sys/class/net/<mesh_iface>/mesh/gw_sel_class

Date:           October 2010

Contact:        Marek Lindner <lindner_marek@yahoo.de>

Description:

                Defines the selection criteria this node will use

                to choose a gateway if gw_mode was set to 'client'.



What:           /sys/class/net/<mesh_iface>/mesh/orig_interval

Date:           May 2010

Contact:        Marek Lindner <lindner_marek@yahoo.de>

Description:

                Defines the interval in milliseconds in which batman

                sends its protocol messages.



What:           /sys/class/net/<mesh_iface>/mesh/hop_penalty

Date:           Oct 2010

Contact:        Linus Lüssing <linus.luessing@web.de>

Description:

		Defines the penalty which will be applied to an

		originator message's tq-field on every hop.



What:           /sys/class/net/<mesh_iface>/mesh/vis_mode

Date:           May 2010

Contact:        Marek Lindner <lindner_marek@yahoo.de>

Description:

                Each batman node only maintains information about its

                own local neighborhood, therefore generating graphs

                showing the topology of the entire mesh is not easily

                feasible without having a central instance to collect

                the local topologies from all nodes. This file allows

                to activate the collecting (server) mode.