← Back to branch summary

~ubuntu-branches/ubuntu/raring/linux-ti-omap4/raring-proposed

« back to all changes in this revision

Viewing changes to drivers/scsi/qla2xxx/qla_target.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Ubuntu: 3.5.0-22.34
  • Date: 2013-01-11 15:02:20 UTC
  • mfrom: (72.1.1 quantal-proposed)
  • Revision ID: package-import@ubuntu.com-20130111150220-kgmbtlwhyc4kwqhg
Tags: 3.5.0-217.25
https://launchpad.net/bugs/1097912
https://launchpad.net/bugs/1097343
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
* Release Tracking Bug
  - LP: #1097912

[ Paolo Pisati ]

* rebased on Ubuntu-3.5.0-22.34

[ Ubuntu: 3.5.0-22.34 ]

* Release Tracking Bug
  - LP: #1097343
* Revert "SAUCE: fsnotify: dont put marks on temporary list when clearing
  marks by group"
  - LP: #1096137
* Revert "SAUCE: fsnotify: introduce locked versions of
  fsnotify_add_mark() and fsnotify_remove_mark()"
  - LP: #1096137
* Revert "SAUCE: fsnotify: pass group to fsnotify_destroy_mark()"
  - LP: #1096137
* Revert "SAUCE: fsnotify: use a mutex instead of a spinlock to protect a
  groups mark list"
  - LP: #1096137
* Revert "SAUCE: fanotify: add an extra flag to mark_remove_from_mask
  that indicates wheather a mark should be destroyed"
  - LP: #1096137
* Revert "SAUCE: fsnotify: take groups mark_lock before mark lock"
  - LP: #1096137
* Revert "SAUCE: fsnotify: use reference counting for groups"
  - LP: #1096137
* Revert "SAUCE: fsnotify: introduce fsnotify_get_group()"
  - LP: #1096137
* fsnotify: introduce fsnotify_get_group()
  - LP: #1096137
* fsnotify: use reference counting for groups
  - LP: #1096137
* fsnotify: take groups mark_lock before mark lock
  - LP: #1096137
* fanotify: add an extra flag to mark_remove_from_mask that indicates
  wheather a mark should be destroyed
  - LP: #1096137
* fsnotify: use a mutex instead of a spinlock to protect a groups mark
  list
  - LP: #1096137
* fsnotify: pass group to fsnotify_destroy_mark()
  - LP: #1096137
* fsnotify: introduce locked versions of fsnotify_add_mark() and
  fsnotify_remove_mark()
  - LP: #1096137
* fsnotify: dont put marks on temporary list when clearing marks by group
  - LP: #1096137
* fsnotify: change locking order
  - LP: #1096137

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/scsi/qla2xxx/qla_target.c
557
557
        int pmap_len;
558
558
        fc_port_t *fcport;
559
559
        int global_resets;
 
560
        unsigned long flags;
560
561
 
561
562
retry:
562
563
        global_resets = atomic_read(&ha->tgt.qla_tgt->tgt_global_resets_count);
625
626
            sess->s_id.b.area, sess->loop_id, fcport->d_id.b.domain,
626
627
            fcport->d_id.b.al_pa, fcport->d_id.b.area, fcport->loop_id);
627
628
 
628
 
        sess->s_id = fcport->d_id;
629
 
        sess->loop_id = fcport->loop_id;
630
 
        sess->conf_compl_supported = !!(fcport->flags &
631
 
            FCF_CONF_COMP_SUPPORTED);
 
629
        spin_lock_irqsave(&ha->hardware_lock, flags);
 
630
        ha->tgt.tgt_ops->update_sess(sess, fcport->d_id, fcport->loop_id,
 
631
                                (fcport->flags & FCF_CONF_COMP_SUPPORTED));
 
632
        spin_unlock_irqrestore(&ha->hardware_lock, flags);
632
633
 
633
634
        res = true;
634
635
 
740
741
                                qlt_undelete_sess(sess);
741
742
 
742
743
                        kref_get(&sess->se_sess->sess_kref);
743
 
                        sess->s_id = fcport->d_id;
744
 
                        sess->loop_id = fcport->loop_id;
745
 
                        sess->conf_compl_supported = !!(fcport->flags &
746
 
                            FCF_CONF_COMP_SUPPORTED);
 
744
                        ha->tgt.tgt_ops->update_sess(sess, fcport->d_id, fcport->loop_id,
 
745
                                                (fcport->flags & FCF_CONF_COMP_SUPPORTED));
 
746
 
747
747
                        if (sess->local && !local)
748
748
                                sess->local = 0;
749
749
                        spin_unlock_irqrestore(&ha->hardware_lock, flags);
796
796
         */
797
797
        kref_get(&sess->se_sess->sess_kref);
798
798
 
799
 
        sess->conf_compl_supported = !!(fcport->flags &
800
 
            FCF_CONF_COMP_SUPPORTED);
 
799
        sess->conf_compl_supported = (fcport->flags & FCF_CONF_COMP_SUPPORTED);
801
800
        BUILD_BUG_ON(sizeof(sess->port_name) != sizeof(fcport->port_name));
802
801
        memcpy(sess->port_name, fcport->port_name, sizeof(sess->port_name));
803
802
 
869
868
                        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf007,
870
869
                            "Reappeared sess %p\n", sess);
871
870
                }
872
 
                sess->s_id = fcport->d_id;
873
 
                sess->loop_id = fcport->loop_id;
874
 
                sess->conf_compl_supported = !!(fcport->flags &
875
 
                    FCF_CONF_COMP_SUPPORTED);
 
871
                ha->tgt.tgt_ops->update_sess(sess, fcport->d_id, fcport->loop_id,
 
872
                                        (fcport->flags & FCF_CONF_COMP_SUPPORTED));
876
873
        }
877
874
 
878
875
        if (sess && sess->local) {