diff options
| -rw-r--r-- | fs/afs/callback.c | 2 | ||||
| -rw-r--r-- | fs/afs/cell.c | 2 | ||||
| -rw-r--r-- | fs/afs/cmservice.c | 2 | ||||
| -rw-r--r-- | fs/afs/internal.h | 1 | ||||
| -rw-r--r-- | fs/afs/mntpt.c | 2 | ||||
| -rw-r--r-- | fs/afs/proc.c | 2 | ||||
| -rw-r--r-- | fs/afs/rxrpc.c | 3 | ||||
| -rw-r--r-- | fs/afs/server.c | 2 | ||||
| -rw-r--r-- | fs/afs/vlocation.c | 6 | ||||
| -rw-r--r-- | fs/afs/write.c | 6 |
10 files changed, 17 insertions, 11 deletions
diff --git a/fs/afs/callback.c b/fs/afs/callback.c index b8243945818d..a78d5b236bb1 100644 --- a/fs/afs/callback.c +++ b/fs/afs/callback.c @@ -20,7 +20,9 @@ #include <linux/sched.h> #include "internal.h" +#if 0 unsigned afs_vnode_update_timeout = 10; +#endif /* 0 */ #define afs_breakring_space(server) \ CIRC_SPACE((server)->cb_break_head, (server)->cb_break_tail, \ diff --git a/fs/afs/cell.c b/fs/afs/cell.c index 175a567db78c..ccfa89f35259 100644 --- a/fs/afs/cell.c +++ b/fs/afs/cell.c @@ -265,6 +265,7 @@ struct afs_cell *afs_cell_lookup(const char *name, unsigned namesz) return cell; } +#if 0 /* * try and get a cell record */ @@ -280,6 +281,7 @@ struct afs_cell *afs_get_cell_maybe(struct afs_cell *cell) write_unlock(&afs_cells_lock); return cell; } +#endif /* 0 */ /* * destroy a cell record diff --git a/fs/afs/cmservice.c b/fs/afs/cmservice.c index d5b2ad6575bc..47b71c8947f9 100644 --- a/fs/afs/cmservice.c +++ b/fs/afs/cmservice.c @@ -16,7 +16,9 @@ #include "internal.h" #include "afs_cm.h" +#if 0 struct workqueue_struct *afs_cm_workqueue; +#endif /* 0 */ static int afs_deliver_cb_init_call_back_state(struct afs_call *, struct sk_buff *, bool); diff --git a/fs/afs/internal.h b/fs/afs/internal.h index 6306438f331f..5ca3625cd39e 100644 --- a/fs/afs/internal.h +++ b/fs/afs/internal.h @@ -570,7 +570,6 @@ extern int afs_abort_to_error(u32); */ extern const struct inode_operations afs_mntpt_inode_operations; extern const struct file_operations afs_mntpt_file_operations; -extern unsigned long afs_mntpt_expiry_timeout; extern int afs_mntpt_check_symlink(struct afs_vnode *, struct key *); extern void afs_mntpt_kill_timer(void); diff --git a/fs/afs/mntpt.c b/fs/afs/mntpt.c index 6f8c96fb29eb..5ce43b63c60e 100644 --- a/fs/afs/mntpt.c +++ b/fs/afs/mntpt.c @@ -42,7 +42,7 @@ const struct inode_operations afs_mntpt_inode_operations = { static LIST_HEAD(afs_vfsmounts); static DECLARE_DELAYED_WORK(afs_mntpt_expiry_timer, afs_mntpt_expiry_timed_out); -unsigned long afs_mntpt_expiry_timeout = 10 * 60; +static unsigned long afs_mntpt_expiry_timeout = 10 * 60; /* * check a symbolic link to see whether it actually encodes a mountpoint diff --git a/fs/afs/proc.c b/fs/afs/proc.c index 6edb56683b9a..846c7615ac9e 100644 --- a/fs/afs/proc.c +++ b/fs/afs/proc.c @@ -513,7 +513,7 @@ static void afs_proc_cell_volumes_stop(struct seq_file *p, void *v) up_read(&cell->vl_sem); } -const char afs_vlocation_states[][4] = { +static const char afs_vlocation_states[][4] = { [AFS_VL_NEW] = "New", [AFS_VL_CREATING] = "Crt", [AFS_VL_VALID] = "Val", diff --git a/fs/afs/rxrpc.c b/fs/afs/rxrpc.c index 8ccee9ee1d9d..bde3f19c0995 100644 --- a/fs/afs/rxrpc.c +++ b/fs/afs/rxrpc.c @@ -239,7 +239,8 @@ void afs_flat_call_destructor(struct afs_call *call) /* * attach the data from a bunch of pages on an inode to a call */ -int afs_send_pages(struct afs_call *call, struct msghdr *msg, struct kvec *iov) +static int afs_send_pages(struct afs_call *call, struct msghdr *msg, + struct kvec *iov) { struct page *pages[8]; unsigned count, n, loop, offset, to; diff --git a/fs/afs/server.c b/fs/afs/server.c index 231ae4150279..28f2451419e1 100644 --- a/fs/afs/server.c +++ b/fs/afs/server.c @@ -13,7 +13,7 @@ #include <linux/slab.h> #include "internal.h" -unsigned afs_server_timeout = 10; /* server timeout in seconds */ +static unsigned afs_server_timeout = 10; /* server timeout in seconds */ static void afs_reap_server(struct work_struct *); diff --git a/fs/afs/vlocation.c b/fs/afs/vlocation.c index 09e3ad0fc7cc..7b4bbe48112d 100644 --- a/fs/afs/vlocation.c +++ b/fs/afs/vlocation.c @@ -15,8 +15,8 @@ #include <linux/sched.h> #include "internal.h" -unsigned afs_vlocation_timeout = 10; /* volume location timeout in seconds */ -unsigned afs_vlocation_update_timeout = 10 * 60; +static unsigned afs_vlocation_timeout = 10; /* volume location timeout in seconds */ +static unsigned afs_vlocation_update_timeout = 10 * 60; static void afs_vlocation_reaper(struct work_struct *); static void afs_vlocation_updater(struct work_struct *); @@ -335,7 +335,7 @@ static int afs_vlocation_fill_in_record(struct afs_vlocation *vl, /* * queue a vlocation record for updates */ -void afs_vlocation_queue_for_updates(struct afs_vlocation *vl) +static void afs_vlocation_queue_for_updates(struct afs_vlocation *vl) { struct afs_vlocation *xvl; diff --git a/fs/afs/write.c b/fs/afs/write.c index a03b92a0fe1d..bf0955d91f85 100644 --- a/fs/afs/write.c +++ b/fs/afs/write.c @@ -510,9 +510,9 @@ int afs_writepage(struct page *page, struct writeback_control *wbc) /* * write a region of pages back to the server */ -int afs_writepages_region(struct address_space *mapping, - struct writeback_control *wbc, - pgoff_t index, pgoff_t end, pgoff_t *_next) +static int afs_writepages_region(struct address_space *mapping, + struct writeback_control *wbc, + pgoff_t index, pgoff_t end, pgoff_t *_next) { struct backing_dev_info *bdi = mapping->backing_dev_info; struct afs_writeback *wb; |
