From d6c6c0bae2dc5cbac06138dde88c1425efa2daa4 Mon Sep 17 00:00:00 2001 From: Dave Chinner Date: Mon, 8 Oct 2012 21:56:09 +1100 Subject: [PATCH] --- yaml --- r: 339381 b: refs/heads/master c: 6d8b79cfca39399ef9115fb65dde85993455c9a3 h: refs/heads/master i: 339379: 43de1d3eb1eb3f9b7d449ec52d1a0fe8801f1419 v: v3 --- [refs] | 2 +- trunk/fs/xfs/Makefile | 2 +- trunk/fs/xfs/{xfs_sync.c => xfs_icache.c} | 1 + trunk/fs/xfs/{xfs_sync.h => xfs_icache.h} | 0 trunk/fs/xfs/xfs_iget.c | 1 + trunk/fs/xfs/xfs_mount.c | 1 + trunk/fs/xfs/xfs_mount.h | 2 -- trunk/fs/xfs/xfs_qm_syscalls.c | 1 + trunk/fs/xfs/xfs_super.c | 2 +- 9 files changed, 7 insertions(+), 5 deletions(-) rename trunk/fs/xfs/{xfs_sync.c => xfs_icache.c} (99%) rename trunk/fs/xfs/{xfs_sync.h => xfs_icache.h} (100%) diff --git a/[refs] b/[refs] index f37106d834d5..57cc73f4ff0e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c75921a72a7c4bb73a5e09a697a672722e5543f1 +refs/heads/master: 6d8b79cfca39399ef9115fb65dde85993455c9a3 diff --git a/trunk/fs/xfs/Makefile b/trunk/fs/xfs/Makefile index d2bf974b1a2f..442f256dbcac 100644 --- a/trunk/fs/xfs/Makefile +++ b/trunk/fs/xfs/Makefile @@ -39,6 +39,7 @@ xfs-y += xfs_aops.o \ xfs_fsops.o \ xfs_fs_subr.o \ xfs_globals.o \ + xfs_icache.o \ xfs_iget.o \ xfs_ioctl.o \ xfs_iomap.o \ @@ -47,7 +48,6 @@ xfs-y += xfs_aops.o \ xfs_message.o \ xfs_mru_cache.o \ xfs_super.o \ - xfs_sync.o \ xfs_xattr.o \ xfs_rename.o \ xfs_utils.o \ diff --git a/trunk/fs/xfs/xfs_sync.c b/trunk/fs/xfs/xfs_icache.c similarity index 99% rename from trunk/fs/xfs/xfs_sync.c rename to trunk/fs/xfs/xfs_icache.c index 7b630288bab5..eba216f11d5e 100644 --- a/trunk/fs/xfs/xfs_sync.c +++ b/trunk/fs/xfs/xfs_icache.c @@ -36,6 +36,7 @@ #include "xfs_quota.h" #include "xfs_trace.h" #include "xfs_fsops.h" +#include "xfs_icache.h" #include #include diff --git a/trunk/fs/xfs/xfs_sync.h b/trunk/fs/xfs/xfs_icache.h similarity index 100% rename from trunk/fs/xfs/xfs_sync.h rename to trunk/fs/xfs/xfs_icache.h diff --git a/trunk/fs/xfs/xfs_iget.c b/trunk/fs/xfs/xfs_iget.c index 784a803383ec..069c5ceb9459 100644 --- a/trunk/fs/xfs/xfs_iget.c +++ b/trunk/fs/xfs/xfs_iget.c @@ -38,6 +38,7 @@ #include "xfs_inode_item.h" #include "xfs_bmap.h" #include "xfs_trace.h" +#include "xfs_icache.h" /* diff --git a/trunk/fs/xfs/xfs_mount.c b/trunk/fs/xfs/xfs_mount.c index c195ec85c725..6f1c997704cd 100644 --- a/trunk/fs/xfs/xfs_mount.c +++ b/trunk/fs/xfs/xfs_mount.c @@ -42,6 +42,7 @@ #include "xfs_fsops.h" #include "xfs_utils.h" #include "xfs_trace.h" +#include "xfs_icache.h" #ifdef HAVE_PERCPU_SB diff --git a/trunk/fs/xfs/xfs_mount.h b/trunk/fs/xfs/xfs_mount.h index 7c417b6b99ee..a631ca3b9065 100644 --- a/trunk/fs/xfs/xfs_mount.h +++ b/trunk/fs/xfs/xfs_mount.h @@ -51,8 +51,6 @@ typedef struct xfs_trans_reservations { #else /* __KERNEL__ */ -#include "xfs_sync.h" - struct xlog; struct xfs_inode; struct xfs_mru_cache; diff --git a/trunk/fs/xfs/xfs_qm_syscalls.c b/trunk/fs/xfs/xfs_qm_syscalls.c index 858a3b186110..7a9071f8855f 100644 --- a/trunk/fs/xfs/xfs_qm_syscalls.c +++ b/trunk/fs/xfs/xfs_qm_syscalls.c @@ -40,6 +40,7 @@ #include "xfs_utils.h" #include "xfs_qm.h" #include "xfs_trace.h" +#include "xfs_icache.h" STATIC int xfs_qm_log_quotaoff(xfs_mount_t *, xfs_qoff_logitem_t **, uint); STATIC int xfs_qm_log_quotaoff_end(xfs_mount_t *, xfs_qoff_logitem_t *, diff --git a/trunk/fs/xfs/xfs_super.c b/trunk/fs/xfs/xfs_super.c index fdedf2cabae3..3d9ea947e9f8 100644 --- a/trunk/fs/xfs/xfs_super.c +++ b/trunk/fs/xfs/xfs_super.c @@ -49,7 +49,7 @@ #include "xfs_extfree_item.h" #include "xfs_mru_cache.h" #include "xfs_inode_item.h" -#include "xfs_sync.h" +#include "xfs_icache.h" #include "xfs_trace.h" #include