Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755577Ab0BJJ30 (ORCPT ); Wed, 10 Feb 2010 04:29:26 -0500 Received: from acsinet12.oracle.com ([141.146.126.234]:60970 "EHLO acsinet12.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755437Ab0BJJ3T (ORCPT ); Wed, 10 Feb 2010 04:29:19 -0500 From: Joel Becker To: ocfs2-devel@oss.oracle.com Cc: linux-kernel@vger.kernel.org, mfasheh@suse.com Subject: [PATCH 03/11] ocfs2_dlmfs: Move to its own directory Date: Wed, 10 Feb 2010 01:27:46 -0800 Message-Id: <1265794074-19539-4-git-send-email-joel.becker@oracle.com> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: <1265794074-19539-1-git-send-email-joel.becker@oracle.com> References: <1265794074-19539-1-git-send-email-joel.becker@oracle.com> X-Source-IP: acsmt357.oracle.com [141.146.40.157] X-Auth-Type: Internal IP X-CT-RefId: str=0001.0A090204.4B727C69.0089:SCFMA4539814,ss=1,fgs=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3634 Lines: 111 We're going to remove the tie between ocfs2_dlmfs and o2dlm. ocfs2_dlmfs doesn't belong in the fs/ocfs2/dlm directory anymore. Here we move it to fs/ocfs2/dlmfs. Signed-off-by: Joel Becker --- fs/ocfs2/Makefile | 1 + fs/ocfs2/dlm/Makefile | 3 +-- fs/ocfs2/dlmfs/Makefile | 5 +++++ fs/ocfs2/{dlm => dlmfs}/dlmfs.c | 2 +- fs/ocfs2/{dlm => dlmfs}/dlmfsver.c | 0 fs/ocfs2/{dlm => dlmfs}/dlmfsver.h | 0 fs/ocfs2/{dlm => dlmfs}/userdlm.c | 2 +- fs/ocfs2/{dlm => dlmfs}/userdlm.h | 0 8 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 fs/ocfs2/dlmfs/Makefile rename fs/ocfs2/{dlm => dlmfs}/dlmfs.c (99%) rename fs/ocfs2/{dlm => dlmfs}/dlmfsver.c (100%) rename fs/ocfs2/{dlm => dlmfs}/dlmfsver.h (100%) rename fs/ocfs2/{dlm => dlmfs}/userdlm.c (99%) rename fs/ocfs2/{dlm => dlmfs}/userdlm.h (100%) diff --git a/fs/ocfs2/Makefile b/fs/ocfs2/Makefile index 600d2d2..791c088 100644 --- a/fs/ocfs2/Makefile +++ b/fs/ocfs2/Makefile @@ -46,6 +46,7 @@ ocfs2_stackglue-objs := stackglue.o ocfs2_stack_o2cb-objs := stack_o2cb.o ocfs2_stack_user-objs := stack_user.o +obj-$(CONFIG_OCFS2_FS) += dlmfs/ # cluster/ is always needed when OCFS2_FS for masklog support obj-$(CONFIG_OCFS2_FS) += cluster/ obj-$(CONFIG_OCFS2_FS_O2CB) += dlm/ diff --git a/fs/ocfs2/dlm/Makefile b/fs/ocfs2/dlm/Makefile index 1903613..dcebf0d 100644 --- a/fs/ocfs2/dlm/Makefile +++ b/fs/ocfs2/dlm/Makefile @@ -1,8 +1,7 @@ EXTRA_CFLAGS += -Ifs/ocfs2 -obj-$(CONFIG_OCFS2_FS_O2CB) += ocfs2_dlm.o ocfs2_dlmfs.o +obj-$(CONFIG_OCFS2_FS_O2CB) += ocfs2_dlm.o ocfs2_dlm-objs := dlmdomain.o dlmdebug.o dlmthread.o dlmrecovery.o \ dlmmaster.o dlmast.o dlmconvert.o dlmlock.o dlmunlock.o dlmver.o -ocfs2_dlmfs-objs := userdlm.o dlmfs.o dlmfsver.o diff --git a/fs/ocfs2/dlmfs/Makefile b/fs/ocfs2/dlmfs/Makefile new file mode 100644 index 0000000..df69b48 --- /dev/null +++ b/fs/ocfs2/dlmfs/Makefile @@ -0,0 +1,5 @@ +EXTRA_CFLAGS += -Ifs/ocfs2 + +obj-$(CONFIG_OCFS2_FS) += ocfs2_dlmfs.o + +ocfs2_dlmfs-objs := userdlm.o dlmfs.o dlmfsver.o diff --git a/fs/ocfs2/dlm/dlmfs.c b/fs/ocfs2/dlmfs/dlmfs.c similarity index 99% rename from fs/ocfs2/dlm/dlmfs.c rename to fs/ocfs2/dlmfs/dlmfs.c index ddf55da..e21ce0e 100644 --- a/fs/ocfs2/dlm/dlmfs.c +++ b/fs/ocfs2/dlmfs/dlmfs.c @@ -52,7 +52,7 @@ #include "cluster/heartbeat.h" #include "cluster/tcp.h" -#include "dlmapi.h" +#include "dlm/dlmapi.h" #include "userdlm.h" diff --git a/fs/ocfs2/dlm/dlmfsver.c b/fs/ocfs2/dlmfs/dlmfsver.c similarity index 100% rename from fs/ocfs2/dlm/dlmfsver.c rename to fs/ocfs2/dlmfs/dlmfsver.c diff --git a/fs/ocfs2/dlm/dlmfsver.h b/fs/ocfs2/dlmfs/dlmfsver.h similarity index 100% rename from fs/ocfs2/dlm/dlmfsver.h rename to fs/ocfs2/dlmfs/dlmfsver.h diff --git a/fs/ocfs2/dlm/userdlm.c b/fs/ocfs2/dlmfs/userdlm.c similarity index 99% rename from fs/ocfs2/dlm/userdlm.c rename to fs/ocfs2/dlmfs/userdlm.c index 4cb1d3d..6adae70 100644 --- a/fs/ocfs2/dlm/userdlm.c +++ b/fs/ocfs2/dlmfs/userdlm.c @@ -39,7 +39,7 @@ #include "cluster/heartbeat.h" #include "cluster/tcp.h" -#include "dlmapi.h" +#include "dlm/dlmapi.h" #include "userdlm.h" diff --git a/fs/ocfs2/dlm/userdlm.h b/fs/ocfs2/dlmfs/userdlm.h similarity index 100% rename from fs/ocfs2/dlm/userdlm.h rename to fs/ocfs2/dlmfs/userdlm.h -- 1.6.6.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/