From f8acaf0bda2394bd288ce13fab825061b032e85f Mon Sep 17 00:00:00 2001 From: Vasu Dev Date: Wed, 21 Oct 2009 16:27:39 -0700 Subject: [PATCH] --- yaml --- r: 173609 b: refs/heads/master c: e95147d8fa4e63bf6d8ff249f074d0047338fc61 h: refs/heads/master i: 173607: 15109ebd9765c8d76a20f77b999d42af6855cd66 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/libfc/fc_exch.c | 1 - trunk/include/scsi/libfc.h | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0fa920f383ac..e35e7eb8d5f5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f127ad97a985d43b3cdf4b644e77a775b6035d4 +refs/heads/master: e95147d8fa4e63bf6d8ff249f074d0047338fc61 diff --git a/trunk/drivers/scsi/libfc/fc_exch.c b/trunk/drivers/scsi/libfc/fc_exch.c index 8ce418296537..170cdf4bac97 100644 --- a/trunk/drivers/scsi/libfc/fc_exch.c +++ b/trunk/drivers/scsi/libfc/fc_exch.c @@ -75,7 +75,6 @@ struct fc_exch_mgr { struct kref kref; /* exchange mgr reference count */ u16 min_xid; /* min exchange ID */ u16 max_xid; /* max exchange ID */ - struct list_head ex_list; /* allocated exchanges list */ mempool_t *ep_pool; /* reserve ep's */ u16 pool_max_index; /* max exch array index in exch pool */ struct fc_exch_pool *pool; /* per cpu exch pool */ diff --git a/trunk/include/scsi/libfc.h b/trunk/include/scsi/libfc.h index 65dc9aacbf70..4ff148580562 100644 --- a/trunk/include/scsi/libfc.h +++ b/trunk/include/scsi/libfc.h @@ -742,7 +742,6 @@ struct fc_lport { /* Miscellaneous */ struct delayed_work retry_work; - struct delayed_work disc_work; }; /*