v2.4.7 -> v2.4.7.1

  - Anton Altaparmakov: NTFS error checking
  - Johannes Erdfelt: USB updates
  - OGAWA Hirofumi: FAT update
  - Alan Cox: driver + s390 update merge
  - Richard Henderson: fix alpha sigsuspend error return value
  - Marcelo Tosatti: per-zone VM shortage
  - Daniel Phillips: generic use-once optimization instead of drop-behind
  - Bjorn Wesen: Cris architecture update
  - Anton Altaparmakov: support for Windows Dynamic Disks
  - James Washer: LDT loading SMP bug fix

4 files changed, 10 insertions, 10 deletions

diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
index 3f8d354bd0f8..37feb6f6ef53 100644
--- a/include/linux/sunrpc/clnt.h
+++ b/include/linux/sunrpc/clnt.h
@@ -130,7 +130,7 @@ int rpc_call(struct rpc_clnt *clnt, u32 proc, void *argp, void *resp, int flags)
 }
 		
 
-extern __inline__ void
+static __inline__ void
 rpc_set_timeout(struct rpc_clnt *clnt, unsigned int retr, unsigned long incr)
 {
 	xprt_set_timeout(&clnt->cl_timeout, retr, incr);
diff --git a/include/linux/sunrpc/sched.h b/include/linux/sunrpc/sched.h
index e106bf92ce96..eee6756b842a 100644
--- a/include/linux/sunrpc/sched.h
+++ b/include/linux/sunrpc/sched.h
@@ -180,13 +180,13 @@ void		rpciod_wake_up(void);
 void		rpc_show_tasks(void);
 #endif
 
-extern __inline__ void *
+static __inline__ void *
 rpc_malloc(struct rpc_task *task, unsigned int size)
 {
 	return rpc_allocate(task->tk_flags, size);
 }
 
-extern __inline__ void
+static __inline__ void
 rpc_exit(struct rpc_task *task, int status)
 {
 	task->tk_status = status;
@@ -194,7 +194,7 @@ rpc_exit(struct rpc_task *task, int status)
 }
 
 #ifdef RPC_DEBUG
-extern __inline__ char *
+static __inline__ char *
 rpc_qname(struct rpc_wait_queue *q)
 {
 	return q->name? q->name : "unknown";
diff --git a/include/linux/sunrpc/stats.h b/include/linux/sunrpc/stats.h
index 24da571cb52d..13c7989d67d7 100644
--- a/include/linux/sunrpc/stats.h
+++ b/include/linux/sunrpc/stats.h
@@ -59,13 +59,13 @@ void			svc_proc_zero(struct svc_program *);
 
 #else
 
-extern inline void svc_proc_unregister(const char *p) {}
-extern inline struct proc_dir_entry*svc_proc_register(struct svc_stat *s)
+static inline void svc_proc_unregister(const char *p) {}
+static inline struct proc_dir_entry*svc_proc_register(struct svc_stat *s)
 {
 	return NULL;
 }
 
-extern inline int svc_proc_read(char *a, char **b, off_t c, int d, int *e, void *f)
+static inline int svc_proc_read(char *a, char **b, off_t c, int d, int *e, void *f)
 {
 	return 0;
 }
diff --git a/include/linux/sunrpc/types.h b/include/linux/sunrpc/types.h
index 467445e06db9..232ac45c725e 100644
--- a/include/linux/sunrpc/types.h
+++ b/include/linux/sunrpc/types.h
@@ -21,7 +21,7 @@ struct rpc_listitem	{
 	struct rpc_listitem *	next;
 };
 
-extern __inline__ void
+static __inline__ void
 __rpc_append_list(struct rpc_listitem **q, struct rpc_listitem *item)
 {
 	struct rpc_listitem	*next, *prev;
@@ -37,14 +37,14 @@ __rpc_append_list(struct rpc_listitem **q, struct rpc_listitem *item)
 	}
 }
 
-extern __inline__ void
+static __inline__ void
 __rpc_insert_list(struct rpc_listitem **q, struct rpc_listitem *item)
 {
 	__rpc_append_list(q, item);
 	*q = item;
 }
 
-extern __inline__ void
+static __inline__ void
 __rpc_remove_list(struct rpc_listitem **q, struct rpc_listitem *item)
 {
 	struct rpc_listitem	*prev = item->prev,