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

Commit c3c66193 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge with kernel.org:/pub/scm/linux/kernel/git/gregkh/aoe-2.6.git/ 

for 11 aoe bugfix patches.
parents c79bea07 a4b38364

Documentation/aoe/mkdevs.sh

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ n_partitions=${n_partitions:-16} 


if test "$#" != "1"; then

	echo "Usage: sh `basename $0` {dir}" 1>&2

	echo "       n_partitions=16 sh `basename $0` {dir}" 1>&2

	exit 1

fi

dir=$1

Documentation/aoe/mkshelf.sh

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


if test "$#" != "2"; then

	echo "Usage: sh `basename $0` {dir} {shelfaddress}" 1>&2

	echo "       n_partitions=16 sh `basename $0` {dir} {shelfaddress}" 1>&2

	exit 1

fi

n_partitions=${n_partitions:-16}

Documentation/aoe/todo.txt

0 → 100644
+14 −0
Original line number Diff line number Diff line 
There is a potential for deadlock when allocating a struct sk_buff for

data that needs to be written out to aoe storage.  If the data is

being written from a dirty page in order to free that page, and if

there are no other pages available, then deadlock may occur when a

free page is needed for the sk_buff allocation.  This situation has

not been observed, but it would be nice to eliminate any potential for

deadlock under memory pressure.



Because ATA over Ethernet is not fragmented by the kernel's IP code,

the destructore member of the struct sk_buff is available to the aoe

driver.  By using a mempool for allocating all but the first few

sk_buffs, and by registering a destructor, we should be able to

efficiently allocate sk_buffs without introducing any potential for

deadlock.

Documentation/aoe/udev-install.sh

+5 −1
Original line number Diff line number Diff line
@@ -23,4 +23,8 @@ fi 
# /etc/udev/rules.d

#

rules_d="`sed -n '/^udev_rules=/{ s!udev_rules=!!; s!\"!!g; p; }' $conf`"

test "$rules_d" && sh -xc "cp `dirname $0`/udev.txt $rules_d/60-aoe.rules"
 
if test -z "$rules_d" || test ! -d "$rules_d"; then

	echo "$me Error: cannot find udev rules directory" 1>&2

	exit 1

fi

sh -xc "cp `dirname $0`/udev.txt $rules_d/60-aoe.rules"

drivers/block/aoe/aoe.h

+15 −8
Original line number Diff line number Diff line 
/* Copyright (c) 2004 Coraid, Inc.  See COPYING for GPL terms. */

#define VERSION "5"

#define VERSION "6"

#define AOE_MAJOR 152

#define DEVICE_NAME "aoe"



/* set AOE_PARTITIONS to 1 to use whole-disks only

 * default is 16, which is 15 partitions plus the whole disk

 */

#ifndef AOE_PARTITIONS

#define AOE_PARTITIONS 16

#endif



#define SYSMINOR(aoemajor, aoeminor) ((aoemajor) * 10 + (aoeminor))

#define AOEMAJOR(sysminor) ((sysminor) / 10)

#define AOEMINOR(sysminor) ((sysminor) % 10)
@@ -34,13 +39,13 @@ enum { 
struct aoe_hdr {

	unsigned char dst[6];

	unsigned char src[6];

	unsigned char type[2];

	__be16 type;

	unsigned char verfl;

	unsigned char err;

	unsigned char major[2];

	__be16 major;

	unsigned char minor;

	unsigned char cmd;

	unsigned char tag[4];

	__be32 tag;

};



struct aoe_atahdr {
@@ -58,8 +63,8 @@ struct aoe_atahdr { 
};



struct aoe_cfghdr {

	unsigned char bufcnt[2];

	unsigned char fwver[2];

	__be16 bufcnt;

	__be16 fwver;

	unsigned char res;

	unsigned char aoeccmd;

	unsigned char cslen[2];
@@ -85,6 +90,7 @@ enum { 


struct buf {

	struct list_head bufs;

	ulong start_time;	/* for disk stats */

	ulong flags;

	ulong nframesout;

	char *bufaddr;
@@ -125,7 +131,8 @@ struct aoedev { 
	struct timer_list timer;

	spinlock_t lock;

	struct net_device *ifp;	/* interface ed is attached to */

	struct sk_buff *skblist;/* packets needing to be sent */

	struct sk_buff *sendq_hd; /* packets needing to be sent, list head */

	struct sk_buff *sendq_tl;

	mempool_t *bufpool;	/* for deadlock-free Buf allocation */

	struct list_head bufq;	/* queue of bios to work on */

	struct buf *inprocess;	/* the one we're currently working on */
@@ -151,7 +158,7 @@ void aoecmd_cfg_rsp(struct sk_buff *); 


int aoedev_init(void);

void aoedev_exit(void);

struct aoedev *aoedev_bymac(unsigned char *);

struct aoedev *aoedev_by_aoeaddr(int maj, int min);

void aoedev_downdev(struct aoedev *d);

struct aoedev *aoedev_set(ulong, unsigned char *, struct net_device *, ulong);

int aoedev_busy(void);