Merge commit 'origin/master' into next

16 files changed, 145 insertions, 76 deletions

diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
index ff8d27af4786..a11cc9d32591 100644
--- a/include/drm/drm_edid.h
+++ b/include/drm/drm_edid.h
@@ -69,8 +69,8 @@ struct detailed_pixel_timing {
         u8 hborder;
         u8 vborder;
         u8 unknown0:1;
-        u8 vsync_positive:1;
         u8 hsync_positive:1;
+        u8 vsync_positive:1;
         u8 separate_sync:2;
         u8 stereo:1;
         u8 unknown6:1;
diff --git a/include/linux/bio.h b/include/linux/bio.h
index 1b16108a5417..d8bd43bfdcf5 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -531,7 +531,7 @@ extern void bio_integrity_endio(struct bio *, int);
 extern void bio_integrity_advance(struct bio *, unsigned int);
 extern void bio_integrity_trim(struct bio *, unsigned int, unsigned int);
 extern void bio_integrity_split(struct bio *, struct bio_pair *, int);
-extern int bio_integrity_clone(struct bio *, struct bio *, struct bio_set *);
+extern int bio_integrity_clone(struct bio *, struct bio *, gfp_t, struct bio_set *);
 extern int bioset_integrity_create(struct bio_set *, int);
 extern void bioset_integrity_free(struct bio_set *);
 extern void bio_integrity_init_slab(void);
@@ -542,7 +542,7 @@ extern void bio_integrity_init_slab(void);
 #define bioset_integrity_create(a, b)   (0)
 #define bio_integrity_prep(a)           (0)
 #define bio_integrity_enabled(a)        (0)
-#define bio_integrity_clone(a, b, c)    (0)
+#define bio_integrity_clone(a, b, c,d ) (0)
 #define bioset_integrity_free(a)        do { } while (0)
 #define bio_integrity_free(a, b)        do { } while (0)
 #define bio_integrity_endio(a, b)       do { } while (0)
diff --git a/include/linux/capability.h b/include/linux/capability.h
index 1b9872556131..4864a43b2b45 100644
--- a/include/linux/capability.h
+++ b/include/linux/capability.h
@@ -393,8 +393,10 @@ struct cpu_vfs_cap_data {
 # define CAP_FULL_SET     ((kernel_cap_t){{ ~0, ~0 }})
 # define CAP_INIT_EFF_SET ((kernel_cap_t){{ ~CAP_TO_MASK(CAP_SETPCAP), ~0 }})
 # define CAP_FS_SET       ((kernel_cap_t){{ CAP_FS_MASK_B0, CAP_FS_MASK_B1 } })
-# define CAP_NFSD_SET     ((kernel_cap_t){{ CAP_FS_MASK_B0|CAP_TO_MASK(CAP_SYS_RESOURCE), \
-                                        CAP_FS_MASK_B1 } })
+# define CAP_NFSD_SET     ((kernel_cap_t){{ CAP_FS_MASK_B0 \
+                                            | CAP_TO_MASK(CAP_SYS_RESOURCE) \
+                                            | CAP_TO_MASK(CAP_MKNOD), \
+                                            CAP_FS_MASK_B1 } })
 
 #endif /* _KERNEL_CAPABILITY_U32S != 2 */
 
diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
index 1514d534deeb..a3ed7cb8ca34 100644
--- a/include/linux/compiler-gcc.h
+++ b/include/linux/compiler-gcc.h
@@ -52,7 +52,15 @@
 #define __deprecated                    __attribute__((deprecated))
 #define __packed                        __attribute__((packed))
 #define __weak                          __attribute__((weak))
-#define __naked                         __attribute__((naked))
+
+/*
+ * it doesn't make sense on ARM (currently the only user of __naked) to trace
+ * naked functions because then mcount is called without stack and frame pointer
+ * being set up and there is no chance to restore the lr register to the value
+ * before mcount was called.
+ */
+#define __naked                         __attribute__((naked)) notrace
+
 #define __noreturn                      __attribute__((noreturn))
 
 /*
diff --git a/include/linux/dca.h b/include/linux/dca.h
index b00a753eda53..9c20c7e87d0a 100644
--- a/include/linux/dca.h
+++ b/include/linux/dca.h
@@ -1,3 +1,23 @@
+/*
+ * Copyright(c) 2007 - 2009 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59
+ * Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called COPYING.
+ */
 #ifndef DCA_H
 #define DCA_H
 /* DCA Provider API */
diff --git a/include/linux/ide.h b/include/linux/ide.h
index e0cedfe9fad4..25087aead657 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -797,6 +797,7 @@ typedef struct hwif_s {
         struct scatterlist *sg_table;
         int sg_max_nents;               /* Maximum number of entries in it */
         int sg_nents;                   /* Current number of entries in it */
+        int orig_sg_nents;
         int sg_dma_direction;           /* dma transfer direction */
 
         /* data phase of the active command (currently only valid for PIO/DMA) */
diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h
index aa6fe7026de7..51855dfd8adb 100644
--- a/include/linux/lockd/lockd.h
+++ b/include/linux/lockd/lockd.h
@@ -346,6 +346,7 @@ static inline int __nlm_cmp_addr4(const struct sockaddr *sap1,
         return sin1->sin_addr.s_addr == sin2->sin_addr.s_addr;
 }
 
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
 static inline int __nlm_cmp_addr6(const struct sockaddr *sap1,
                                   const struct sockaddr *sap2)
 {
@@ -353,6 +354,13 @@ static inline int __nlm_cmp_addr6(const struct sockaddr *sap1,
         const struct sockaddr_in6 *sin2 = (const struct sockaddr_in6 *)sap2;
         return ipv6_addr_equal(&sin1->sin6_addr, &sin2->sin6_addr);
 }
+#else   /* !(CONFIG_IPV6 || CONFIG_IPV6_MODULE) */
+static inline int __nlm_cmp_addr6(const struct sockaddr *sap1,
+                                  const struct sockaddr *sap2)
+{
+        return 0;
+}
+#endif  /* !(CONFIG_IPV6 || CONFIG_IPV6_MODULE) */
 
 /*
  * Compare two host addresses
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index 92915e81443f..d84feb7bdbf0 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -276,4 +276,7 @@ struct mm_struct {
 #endif
 };
 
+/* Future-safe accessor for struct mm_struct's cpu_vm_mask. */
+#define mm_cpumask(mm) (&(mm)->cpu_vm_mask)
+
 #endif /* _LINUX_MM_TYPES_H */
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index a550b528319f..2e5f00066afd 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -406,6 +406,8 @@ struct nfs3_setaclargs {
         int                     mask;
         struct posix_acl *      acl_access;
         struct posix_acl *      acl_default;
+        size_t                  len;
+        unsigned int            npages;
         struct page **          pages;
 };
 
diff --git a/include/linux/nfsacl.h b/include/linux/nfsacl.h
index 54487a99beb8..43011b69297c 100644
--- a/include/linux/nfsacl.h
+++ b/include/linux/nfsacl.h
@@ -37,6 +37,9 @@
 #define NFSACL_MAXPAGES         ((2*(8+12*NFS_ACL_MAX_ENTRIES) + PAGE_SIZE-1) \
                                  >> PAGE_SHIFT)
 
+#define NFS_ACL_MAX_ENTRIES_INLINE      (5)
+#define NFS_ACL_INLINE_BUFSIZE  ((2*(2+3*NFS_ACL_MAX_ENTRIES_INLINE)) << 2)
+
 static inline unsigned int
 nfsacl_size(struct posix_acl *acl_access, struct posix_acl *acl_default)
 {
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 8c216e057c94..011db2f4c94c 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1419,6 +1419,9 @@ struct task_struct {
 #endif
 };
 
+/* Future-safe accessor for struct task_struct's cpus_allowed. */
+#define tsk_cpumask(tsk) (&(tsk)->cpus_allowed)
+
 /*
  * Priority of a process goes from 0..MAX_PRIO-1, valid RT
  * priority is 0..MAX_RT_PRIO-1, and SCHED_NORMAL/SCHED_BATCH
diff --git a/include/net/netfilter/nf_conntrack_core.h b/include/net/netfilter/nf_conntrack_core.h
index c25068e38516..5a449b44ba33 100644
--- a/include/net/netfilter/nf_conntrack_core.h
+++ b/include/net/netfilter/nf_conntrack_core.h
@@ -62,7 +62,8 @@ static inline int nf_conntrack_confirm(struct sk_buff *skb)
         if (ct && ct != &nf_conntrack_untracked) {
                 if (!nf_ct_is_confirmed(ct) && !nf_ct_is_dying(ct))
                         ret = __nf_conntrack_confirm(skb);
-                nf_ct_deliver_cached_events(ct);
+                if (likely(ret == NF_ACCEPT))
+                        nf_ct_deliver_cached_events(ct);
         }
         return ret;
 }
diff --git a/include/scsi/fc/fc_fcoe.h b/include/scsi/fc/fc_fcoe.h
index 57aaa8f0d613..f271d9cc0fc2 100644
--- a/include/scsi/fc/fc_fcoe.h
+++ b/include/scsi/fc/fc_fcoe.h
@@ -31,10 +31,6 @@
 #define ETH_P_FCOE      0x8906          /* FCOE ether type */
 #endif
 
-#ifndef ETH_P_8021Q
-#define ETH_P_8021Q     0x8100
-#endif
-
 /*
  * FC_FCOE_OUI hasn't been standardized yet.   XXX TBD.
  */
diff --git a/include/scsi/fc/fc_fs.h b/include/scsi/fc/fc_fs.h
index 3e4801d2bdbb..1b7af3a64c7c 100644
--- a/include/scsi/fc/fc_fs.h
+++ b/include/scsi/fc/fc_fs.h
@@ -337,4 +337,9 @@ enum fc_pf_rjt_reason {
         FC_RJT_VENDOR =         0xff,   /* vendor specific reject */
 };
 
+/* default timeout values */
+
+#define FC_DEF_E_D_TOV  2000UL
+#define FC_DEF_R_A_TOV  10000UL
+
 #endif /* _FC_FS_H_ */
diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
index 9f2876397dda..a2e126b86e3e 100644
--- a/include/scsi/libfc.h
+++ b/include/scsi/libfc.h
@@ -68,9 +68,6 @@
 /*
  * FC HBA status
  */
-#define FC_PAUSE                    (1 << 1)
-#define FC_LINK_UP                  (1 << 0)
-
 enum fc_lport_state {
         LPORT_ST_NONE = 0,
         LPORT_ST_FLOGI,
@@ -339,31 +336,17 @@ struct fc_exch {
 
 struct libfc_function_template {
 
-        /**
-         * Mandatory Fields
-         *
-         * These handlers must be implemented by the LLD.
-         */
-
         /*
          * Interface to send a FC frame
-         */
-        int (*frame_send)(struct fc_lport *lp, struct fc_frame *fp);
-
-        /**
-         * Optional Fields
          *
-         * The LLD may choose to implement any of the following handlers.
-         * If LLD doesn't specify hander and leaves its pointer NULL then
-         * the default libfc function will be used for that handler.
-         */
-
-        /**
-         * ELS/CT interfaces
+         * STATUS: REQUIRED
          */
+        int (*frame_send)(struct fc_lport *lp, struct fc_frame *fp);
 
         /*
-         * elsct_send - sends ELS/CT frame
+         * Interface to send ELS/CT frames
+         *
+         * STATUS: OPTIONAL
          */
         struct fc_seq *(*elsct_send)(struct fc_lport *lport,
                                      struct fc_rport *rport,
@@ -373,9 +356,6 @@ struct libfc_function_template {
                                              struct fc_frame *fp,
                                              void *arg),
                                      void *arg, u32 timer_msec);
-        /**
-         * Exhance Manager interfaces
-         */
 
         /*
          * Send the FC frame payload using a new exchange and sequence.
@@ -407,6 +387,8 @@ struct libfc_function_template {
          * timer_msec argument is specified. The timer is canceled when
          * it fires or when the exchange is done. The exchange timeout handler
          * is registered by EM layer.
+         *
+         * STATUS: OPTIONAL
          */
         struct fc_seq *(*exch_seq_send)(struct fc_lport *lp,
                                         struct fc_frame *fp,
@@ -418,14 +400,18 @@ struct libfc_function_template {
                                         void *arg, unsigned int timer_msec);
 
         /*
-         * send a frame using existing sequence and exchange.
+         * Send a frame using an existing sequence and exchange.
+         *
+         * STATUS: OPTIONAL
          */
         int (*seq_send)(struct fc_lport *lp, struct fc_seq *sp,
                         struct fc_frame *fp);
 
         /*
-         * Send ELS response using mainly infomation
-         * in exchange and sequence in EM layer.
+         * Send an ELS response using infomation from a previous
+         * exchange and sequence.
+         *
+         * STATUS: OPTIONAL
          */
         void (*seq_els_rsp_send)(struct fc_seq *sp, enum fc_els_cmd els_cmd,
                                  struct fc_seq_els_data *els_data);
@@ -437,6 +423,8 @@ struct libfc_function_template {
          * A timer_msec can be specified for abort timeout, if non-zero
          * timer_msec value is specified then exchange resp handler
          * will be called with timeout error if no response to abort.
+         *
+         * STATUS: OPTIONAL
          */
         int (*seq_exch_abort)(const struct fc_seq *req_sp,
                               unsigned int timer_msec);
@@ -444,6 +432,8 @@ struct libfc_function_template {
         /*
          * Indicate that an exchange/sequence tuple is complete and the memory
          * allocated for the related objects may be freed.
+         *
+         * STATUS: OPTIONAL
          */
         void (*exch_done)(struct fc_seq *sp);
 
@@ -451,6 +441,8 @@ struct libfc_function_template {
          * Assigns a EM and a free XID for an new exchange and then
          * allocates a new exchange and sequence pair.
          * The fp can be used to determine free XID.
+         *
+         * STATUS: OPTIONAL
          */
         struct fc_exch *(*exch_get)(struct fc_lport *lp, struct fc_frame *fp);
 
@@ -458,12 +450,16 @@ struct libfc_function_template {
          * Release previously assigned XID by exch_get API.
          * The LLD may implement this if XID is assigned by LLD
          * in exch_get().
+         *
+         * STATUS: OPTIONAL
          */
         void (*exch_put)(struct fc_lport *lp, struct fc_exch_mgr *mp,
                          u16 ex_id);
 
         /*
          * Start a new sequence on the same exchange/sequence tuple.
+         *
+         * STATUS: OPTIONAL
          */
         struct fc_seq *(*seq_start_next)(struct fc_seq *sp);
 
@@ -471,26 +467,38 @@ struct libfc_function_template {
          * Reset an exchange manager, completing all sequences and exchanges.
          * If s_id is non-zero, reset only exchanges originating from that FID.
          * If d_id is non-zero, reset only exchanges sending to that FID.
+         *
+         * STATUS: OPTIONAL
          */
-        void (*exch_mgr_reset)(struct fc_exch_mgr *,
+        void (*exch_mgr_reset)(struct fc_lport *,
                                u32 s_id, u32 d_id);
 
-        void (*rport_flush_queue)(void);
-        /**
-         * Local Port interfaces
+        /*
+         * Flush the rport work queue. Generally used before shutdown.
+         *
+         * STATUS: OPTIONAL
          */
+        void (*rport_flush_queue)(void);
 
         /*
-         * Receive a frame to a local port.
+         * Receive a frame for a local port.
+         *
+         * STATUS: OPTIONAL
          */
         void (*lport_recv)(struct fc_lport *lp, struct fc_seq *sp,
                            struct fc_frame *fp);
 
+        /*
+         * Reset the local port.
+         *
+         * STATUS: OPTIONAL
+         */
         int (*lport_reset)(struct fc_lport *);
 
-        /**
-         * Remote Port interfaces
+        /*
+         * Create a remote port
          */
+        struct fc_rport *(*rport_create)(struct fc_disc_port *);
 
         /*
          * Initiates the RP state machine. It is called from the LP module.
@@ -500,26 +508,33 @@ struct libfc_function_template {
          * - PLOGI
          * - PRLI
          * - RTV
+         *
+         * STATUS: OPTIONAL
          */
         int (*rport_login)(struct fc_rport *rport);
 
         /*
          * Logoff, and remove the rport from the transport if
          * it had been added. This will send a LOGO to the target.
+         *
+         * STATUS: OPTIONAL
          */
         int (*rport_logoff)(struct fc_rport *rport);
 
         /*
          * Recieve a request from a remote port.
+         *
+         * STATUS: OPTIONAL
          */
         void (*rport_recv_req)(struct fc_seq *, struct fc_frame *,
                                struct fc_rport *);
 
-        struct fc_rport *(*rport_lookup)(const struct fc_lport *, u32);
-
-        /**
-         * FCP interfaces
+        /*
+         * lookup an rport by it's port ID.
+         *
+         * STATUS: OPTIONAL
          */
+        struct fc_rport *(*rport_lookup)(const struct fc_lport *, u32);
 
         /*
          * Send a fcp cmd from fsp pkt.
@@ -527,30 +542,38 @@ struct libfc_function_template {
          *
          * The resp handler is called when FCP_RSP received.
          *
+         * STATUS: OPTIONAL
          */
         int (*fcp_cmd_send)(struct fc_lport *lp, struct fc_fcp_pkt *fsp,
                             void (*resp)(struct fc_seq *, struct fc_frame *fp,
                                          void *arg));
 
         /*
-         * Used at least durring linkdown and reset
+         * Cleanup the FCP layer, used durring link down and reset
+         *
+         * STATUS: OPTIONAL
          */
         void (*fcp_cleanup)(struct fc_lport *lp);
 
         /*
          * Abort all I/O on a local port
+         *
+         * STATUS: OPTIONAL
          */
         void (*fcp_abort_io)(struct fc_lport *lp);
 
-        /**
-         * Discovery interfaces
+        /*
+         * Receive a request for the discovery layer.
+         *
+         * STATUS: OPTIONAL
          */
-
         void (*disc_recv_req)(struct fc_seq *,
                               struct fc_frame *, struct fc_lport *);
 
         /*
          * Start discovery for a local port.
+         *
+         * STATUS: OPTIONAL
          */
         void (*disc_start)(void (*disc_callback)(struct fc_lport *,
                                                  enum fc_disc_event),
@@ -559,6 +582,8 @@ struct libfc_function_template {
         /*
          * Stop discovery for a given lport. This will remove
          * all discovered rports
+         *
+         * STATUS: OPTIONAL
          */
         void (*disc_stop) (struct fc_lport *);
 
@@ -566,6 +591,8 @@ struct libfc_function_template {
          * Stop discovery for a given lport. This will block
          * until all discovered rports are deleted from the
          * FC transport class
+         *
+         * STATUS: OPTIONAL
          */
         void (*disc_stop_final) (struct fc_lport *);
 };
@@ -603,7 +630,8 @@ struct fc_lport {
 
         /* Operational Information */
         struct libfc_function_template tt;
-        u16                     link_status;
+        u8                      link_up;
+        u8                      qfull;
         enum fc_lport_state     state;
         unsigned long           boot_time;
 
@@ -637,7 +665,7 @@ struct fc_lport {
         struct delayed_work     disc_work;
 };
 
-/**
+/*
  * FC_LPORT HELPER FUNCTIONS
  *****************************/
 static inline void *lport_priv(const struct fc_lport *lp)
@@ -669,7 +697,7 @@ static inline void fc_lport_state_enter(struct fc_lport *lp,
 }
 
 
-/**
+/*
  * LOCAL PORT LAYER
  *****************************/
 int fc_lport_init(struct fc_lport *lp);
@@ -704,12 +732,6 @@ void fc_linkup(struct fc_lport *);
 void fc_linkdown(struct fc_lport *);
 
 /*
- * Pause and unpause traffic.
- */
-void fc_pause(struct fc_lport *);
-void fc_unpause(struct fc_lport *);
-
-/*
  * Configure the local port.
  */
 int fc_lport_config(struct fc_lport *);
@@ -725,19 +747,19 @@ int fc_lport_reset(struct fc_lport *);
 int fc_set_mfs(struct fc_lport *lp, u32 mfs);
 
 
-/**
+/*
  * REMOTE PORT LAYER
  *****************************/
 int fc_rport_init(struct fc_lport *lp);
 void fc_rport_terminate_io(struct fc_rport *rp);
 
-/**
+/*
  * DISCOVERY LAYER
  *****************************/
 int fc_disc_init(struct fc_lport *lp);
 
 
-/**
+/*
  * SCSI LAYER
  *****************************/
 /*
@@ -798,7 +820,7 @@ int fc_change_queue_type(struct scsi_device *sdev, int tag_type);
  */
 void fc_fcp_destroy(struct fc_lport *);
 
-/**
+/*
  * ELS/CT interface
  *****************************/
 /*
@@ -807,7 +829,7 @@ void fc_fcp_destroy(struct fc_lport *);
 int fc_elsct_init(struct fc_lport *lp);
 
 
-/**
+/*
  * EXCHANGE MANAGER LAYER
  *****************************/
 /*
@@ -916,7 +938,7 @@ struct fc_seq *fc_seq_start_next(struct fc_seq *sp);
  * If s_id is non-zero, reset only exchanges originating from that FID.
  * If d_id is non-zero, reset only exchanges sending to that FID.
  */
-void fc_exch_mgr_reset(struct fc_exch_mgr *, u32 s_id, u32 d_id);
+void fc_exch_mgr_reset(struct fc_lport *, u32 s_id, u32 d_id);
 
 /*
  * Functions for fc_functions_template
diff --git a/include/scsi/libfcoe.h b/include/scsi/libfcoe.h
index 89fdbb9a6a1b..941818f29f59 100644
--- a/include/scsi/libfcoe.h
+++ b/include/scsi/libfcoe.h
@@ -46,6 +46,7 @@ struct fcoe_softc {
         struct net_device *phys_dev;            /* device with ethtool_ops */
         struct packet_type  fcoe_packet_type;
         struct sk_buff_head fcoe_pending_queue;
+        u8      fcoe_pending_queue_active;
 
         u8 dest_addr[ETH_ALEN];
         u8 ctl_src_addr[ETH_ALEN];
@@ -58,16 +59,10 @@ struct fcoe_softc {
         u8 address_mode;
 };
 
-static inline struct fcoe_softc *fcoe_softc(
-        const struct fc_lport *lp)
-{
-        return (struct fcoe_softc *)lport_priv(lp);
-}
-
 static inline struct net_device *fcoe_netdev(
         const struct fc_lport *lp)
 {
-        return fcoe_softc(lp)->real_dev;
+        return ((struct fcoe_softc *)lport_priv(lp))->real_dev;
 }
 
 static inline struct fcoe_hdr *skb_fcoe_header(const struct sk_buff *skb)