Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 346467
b: refs/heads/master
c: 1b8a163
h: refs/heads/master
i:
  346465: 38984d0
  346463: 8639cda
v: v3
  • Loading branch information
Ed Cashin authored and Linus Torvalds committed Dec 18, 2012
1 parent 7a98ce3 commit c2ce69d
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4e78dd144b865162626f811d1097b6d181ec6a31
refs/heads/master: 1b8a1636ceea573b1d452a1cccf01c990d8d628a
6 changes: 3 additions & 3 deletions trunk/drivers/block/aoe/aoe.h
Original file line number Diff line number Diff line change
Expand Up @@ -122,14 +122,14 @@ struct aoeif {

struct aoetgt {
unsigned char addr[6];
ushort nframes;
ushort nframes; /* cap on frames to use */
struct aoedev *d; /* parent device I belong to */
struct list_head ffree; /* list of free frames */
struct aoeif ifs[NAOEIFS];
struct aoeif *ifp; /* current aoeif in use */
ushort nout;
ushort maxout;
ulong falloc;
ushort maxout; /* current value for max outstanding */
ulong falloc; /* number of allocated frames */
ulong lastwadj; /* last window adjustment */
int minbcnt;
int wpkts, rpkts;
Expand Down
6 changes: 5 additions & 1 deletion trunk/drivers/block/aoe/aoecmd.c
Original file line number Diff line number Diff line change
Expand Up @@ -1373,7 +1373,11 @@ aoecmd_cfg_rsp(struct sk_buff *skb)
spin_lock_irqsave(&d->lock, flags);

t = gettgt(d, h->src);
if (!t) {
if (t) {
t->nframes = n;
if (n < t->maxout)
t->maxout = n;
} else {
t = addtgt(d, h->src, n);
if (!t)
goto bail;
Expand Down

0 comments on commit c2ce69d

Please sign in to comment.