aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Chinner <dchinner@redhat.com>2012-10-08 06:56:09 -0400
committerBen Myers <bpm@sgi.com>2012-10-17 14:40:09 -0400
commit6d8b79cfca39399ef9115fb65dde85993455c9a3 (patch)
treec4702e765ee5b3d10f496c42148e317d7ee98ed8
parentc75921a72a7c4bb73a5e09a697a672722e5543f1 (diff)
xfs: rename xfs_sync.[ch] to xfs_icache.[ch]
xfs_sync.c now only contains inode reclaim functions and inode cache iteration functions. It is not related to sync operations anymore. Rename to xfs_icache.c to reflect it's contents and prepare for consolidation with the other inode cache file that exists (xfs_iget.c). Signed-off-by: Dave Chinner <dchinner@redhat.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Mark Tinguely <tinguely@sgi.com> Signed-off-by: Ben Myers <bpm@sgi.com>
-rw-r--r--fs/xfs/Makefile2
-rw-r--r--fs/xfs/xfs_icache.c (renamed from fs/xfs/xfs_sync.c)1
-rw-r--r--fs/xfs/xfs_icache.h (renamed from fs/xfs/xfs_sync.h)0
-rw-r--r--fs/xfs/xfs_iget.c1
-rw-r--r--fs/xfs/xfs_mount.c1
-rw-r--r--fs/xfs/xfs_mount.h2
-rw-r--r--fs/xfs/xfs_qm_syscalls.c1
-rw-r--r--fs/xfs/xfs_super.c2
8 files changed, 6 insertions, 4 deletions
diff --git a/fs/xfs/Makefile b/fs/xfs/Makefile
index d2bf974b1a2..442f256dbca 100644
--- a/fs/xfs/Makefile
+++ b/fs/xfs/Makefile
@@ -39,6 +39,7 @@ xfs-y += xfs_aops.o \
39 xfs_fsops.o \ 39 xfs_fsops.o \
40 xfs_fs_subr.o \ 40 xfs_fs_subr.o \
41 xfs_globals.o \ 41 xfs_globals.o \
42 xfs_icache.o \
42 xfs_iget.o \ 43 xfs_iget.o \
43 xfs_ioctl.o \ 44 xfs_ioctl.o \
44 xfs_iomap.o \ 45 xfs_iomap.o \
@@ -47,7 +48,6 @@ xfs-y += xfs_aops.o \
47 xfs_message.o \ 48 xfs_message.o \
48 xfs_mru_cache.o \ 49 xfs_mru_cache.o \
49 xfs_super.o \ 50 xfs_super.o \
50 xfs_sync.o \
51 xfs_xattr.o \ 51 xfs_xattr.o \
52 xfs_rename.o \ 52 xfs_rename.o \
53 xfs_utils.o \ 53 xfs_utils.o \
diff --git a/fs/xfs/xfs_sync.c b/fs/xfs/xfs_icache.c
index 7b630288bab..eba216f11d5 100644
--- a/fs/xfs/xfs_sync.c
+++ b/fs/xfs/xfs_icache.c
@@ -36,6 +36,7 @@
36#include "xfs_quota.h" 36#include "xfs_quota.h"
37#include "xfs_trace.h" 37#include "xfs_trace.h"
38#include "xfs_fsops.h" 38#include "xfs_fsops.h"
39#include "xfs_icache.h"
39 40
40#include <linux/kthread.h> 41#include <linux/kthread.h>
41#include <linux/freezer.h> 42#include <linux/freezer.h>
diff --git a/fs/xfs/xfs_sync.h b/fs/xfs/xfs_icache.h
index 0ba9c89c316..0ba9c89c316 100644
--- a/fs/xfs/xfs_sync.h
+++ b/fs/xfs/xfs_icache.h
diff --git a/fs/xfs/xfs_iget.c b/fs/xfs/xfs_iget.c
index 784a803383e..069c5ceb945 100644
--- a/fs/xfs/xfs_iget.c
+++ b/fs/xfs/xfs_iget.c
@@ -38,6 +38,7 @@
38#include "xfs_inode_item.h" 38#include "xfs_inode_item.h"
39#include "xfs_bmap.h" 39#include "xfs_bmap.h"
40#include "xfs_trace.h" 40#include "xfs_trace.h"
41#include "xfs_icache.h"
41 42
42 43
43/* 44/*
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index c195ec85c72..6f1c997704c 100644
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -42,6 +42,7 @@
42#include "xfs_fsops.h" 42#include "xfs_fsops.h"
43#include "xfs_utils.h" 43#include "xfs_utils.h"
44#include "xfs_trace.h" 44#include "xfs_trace.h"
45#include "xfs_icache.h"
45 46
46 47
47#ifdef HAVE_PERCPU_SB 48#ifdef HAVE_PERCPU_SB
diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h
index 7c417b6b99e..a631ca3b906 100644
--- a/fs/xfs/xfs_mount.h
+++ b/fs/xfs/xfs_mount.h
@@ -51,8 +51,6 @@ typedef struct xfs_trans_reservations {
51 51
52#else /* __KERNEL__ */ 52#else /* __KERNEL__ */
53 53
54#include "xfs_sync.h"
55
56struct xlog; 54struct xlog;
57struct xfs_inode; 55struct xfs_inode;
58struct xfs_mru_cache; 56struct xfs_mru_cache;
diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c
index 858a3b18611..7a9071f8855 100644
--- a/fs/xfs/xfs_qm_syscalls.c
+++ b/fs/xfs/xfs_qm_syscalls.c
@@ -40,6 +40,7 @@
40#include "xfs_utils.h" 40#include "xfs_utils.h"
41#include "xfs_qm.h" 41#include "xfs_qm.h"
42#include "xfs_trace.h" 42#include "xfs_trace.h"
43#include "xfs_icache.h"
43 44
44STATIC int xfs_qm_log_quotaoff(xfs_mount_t *, xfs_qoff_logitem_t **, uint); 45STATIC int xfs_qm_log_quotaoff(xfs_mount_t *, xfs_qoff_logitem_t **, uint);
45STATIC int xfs_qm_log_quotaoff_end(xfs_mount_t *, xfs_qoff_logitem_t *, 46STATIC int xfs_qm_log_quotaoff_end(xfs_mount_t *, xfs_qoff_logitem_t *,
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index fdedf2cabae..3d9ea947e9f 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -49,7 +49,7 @@
49#include "xfs_extfree_item.h" 49#include "xfs_extfree_item.h"
50#include "xfs_mru_cache.h" 50#include "xfs_mru_cache.h"
51#include "xfs_inode_item.h" 51#include "xfs_inode_item.h"
52#include "xfs_sync.h" 52#include "xfs_icache.h"
53#include "xfs_trace.h" 53#include "xfs_trace.h"
54 54
55#include <linux/namei.h> 55#include <linux/namei.h>