From a470a8cbd096a9c7f4f9606783506d641f352c09 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sun, 28 Sep 2014 11:06:21 -0600 Subject: [PATCH] Move drive from fs/. to fs/driver/. --- fs/Makefile | 5 +---- fs/{ => driver}/fs_closeblockdriver.c | 2 +- fs/{ => driver}/fs_findblockdriver.c | 2 +- fs/{ => driver}/fs_openblockdriver.c | 2 +- fs/{ => driver}/fs_registerblockdriver.c | 2 +- fs/{ => driver}/fs_registerdriver.c | 2 +- fs/{ => driver}/fs_unregisterblockdriver.c | 2 +- fs/{ => driver}/fs_unregisterdriver.c | 2 +- fs/inode/fs_files.c | 2 +- fs/inode/fs_foreachinode.c | 2 +- fs/inode/fs_inode.c | 2 +- fs/inode/fs_inodeaddref.c | 2 +- fs/inode/fs_inodebasename.c | 2 +- fs/inode/fs_inodefind.c | 2 +- fs/inode/fs_inoderelease.c | 2 +- fs/inode/fs_inoderemove.c | 2 +- fs/inode/fs_inodereserve.c | 2 +- 17 files changed, 17 insertions(+), 20 deletions(-) rename fs/{ => driver}/fs_closeblockdriver.c (99%) rename fs/{ => driver}/fs_findblockdriver.c (99%) rename fs/{ => driver}/fs_openblockdriver.c (99%) rename fs/{ => driver}/fs_registerblockdriver.c (99%) rename fs/{ => driver}/fs_registerdriver.c (99%) rename fs/{ => driver}/fs_unregisterblockdriver.c (98%) rename fs/{ => driver}/fs_unregisterdriver.c (99%) diff --git a/fs/Makefile b/fs/Makefile index c5c61a6d256..856cc231ca0 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -67,14 +67,11 @@ CSRCS += fs_open.c fs_opendir.c fs_poll.c fs_read.c fs_readdir.c CSRCS += fs_rename.c fs_rewinddir.c fs_rmdir.c fs_seekdir.c fs_stat.c CSRCS += fs_statfs.c fs_select.c fs_unlink.c fs_write.c -CSRCS += fs_registerdriver.c fs_unregisterdriver.c -CSRCS += fs_registerblockdriver.c fs_unregisterblockdriver.c -CSRCS += fs_findblockdriver.c fs_openblockdriver.c fs_closeblockdriver.c - DEPPATH = --dep-path . VPATH = . include inode/Make.defs +include driver/Make.defs include mmap/Make.defs # Stream support diff --git a/fs/fs_closeblockdriver.c b/fs/driver/fs_closeblockdriver.c similarity index 99% rename from fs/fs_closeblockdriver.c rename to fs/driver/fs_closeblockdriver.c index cc0e3e2bfd3..a0add5cc751 100644 --- a/fs/fs_closeblockdriver.c +++ b/fs/driver/fs_closeblockdriver.c @@ -1,5 +1,5 @@ /**************************************************************************** - * fs/fs_closeblockdriver.c + * fs/driver/fs_closeblockdriver.c * * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/fs/fs_findblockdriver.c b/fs/driver/fs_findblockdriver.c similarity index 99% rename from fs/fs_findblockdriver.c rename to fs/driver/fs_findblockdriver.c index afc1bb2b827..73133f25f16 100644 --- a/fs/fs_findblockdriver.c +++ b/fs/driver/fs_findblockdriver.c @@ -1,5 +1,5 @@ /**************************************************************************** - * fs/fs_openblockdriver.c + * fs/driver/fs_openblockdriver.c * * Copyright (C) 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/fs/fs_openblockdriver.c b/fs/driver/fs_openblockdriver.c similarity index 99% rename from fs/fs_openblockdriver.c rename to fs/driver/fs_openblockdriver.c index 5bd7b1a6fc6..8c89572d1fc 100644 --- a/fs/fs_openblockdriver.c +++ b/fs/driver/fs_openblockdriver.c @@ -1,5 +1,5 @@ /**************************************************************************** - * fs/fs_openblockdriver.c + * fs/driver/fs_openblockdriver.c * * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/fs/fs_registerblockdriver.c b/fs/driver/fs_registerblockdriver.c similarity index 99% rename from fs/fs_registerblockdriver.c rename to fs/driver/fs_registerblockdriver.c index d55407ff8d9..671ca2fa16e 100644 --- a/fs/fs_registerblockdriver.c +++ b/fs/driver/fs_registerblockdriver.c @@ -1,5 +1,5 @@ /**************************************************************************** - * fs/fs_registerblockdriver.c + * fs/driver/fs_registerblockdriver.c * * Copyright (C) 2007-2009, 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/fs/fs_registerdriver.c b/fs/driver/fs_registerdriver.c similarity index 99% rename from fs/fs_registerdriver.c rename to fs/driver/fs_registerdriver.c index db2aa617d5f..b249861d136 100644 --- a/fs/fs_registerdriver.c +++ b/fs/driver/fs_registerdriver.c @@ -1,5 +1,5 @@ /**************************************************************************** - * fs/fs_registerdriver.c + * fs/driver/fs_registerdriver.c * * Copyright (C) 2007-2009, 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/fs/fs_unregisterblockdriver.c b/fs/driver/fs_unregisterblockdriver.c similarity index 98% rename from fs/fs_unregisterblockdriver.c rename to fs/driver/fs_unregisterblockdriver.c index 20652546178..f886cdce40f 100644 --- a/fs/fs_unregisterblockdriver.c +++ b/fs/driver/fs_unregisterblockdriver.c @@ -1,5 +1,5 @@ /**************************************************************************** - * fs/fs_unregisterblockdriver.c + * fs/driver/fs_unregisterblockdriver.c * * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/fs/fs_unregisterdriver.c b/fs/driver/fs_unregisterdriver.c similarity index 99% rename from fs/fs_unregisterdriver.c rename to fs/driver/fs_unregisterdriver.c index ffd28738310..f9a073e195e 100644 --- a/fs/fs_unregisterdriver.c +++ b/fs/driver/fs_unregisterdriver.c @@ -1,5 +1,5 @@ /**************************************************************************** - * fs/fs_unregisterdriver.c + * fs/driver/fs_unregisterdriver.c * * Copyright (C) 2007-2009, 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/fs/inode/fs_files.c b/fs/inode/fs_files.c index d9db965c792..839cf4f210c 100644 --- a/fs/inode/fs_files.c +++ b/fs/inode/fs_files.c @@ -1,5 +1,5 @@ /**************************************************************************** - * fs/fs_files.c + * fs/inode/fs_files.c * * Copyright (C) 2007-2009, 2011-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/fs/inode/fs_foreachinode.c b/fs/inode/fs_foreachinode.c index 06412d6eacf..a5f32b7c0b8 100644 --- a/fs/inode/fs_foreachinode.c +++ b/fs/inode/fs_foreachinode.c @@ -1,5 +1,5 @@ /**************************************************************************** - * fs/fs_foreachinode.c + * fs/inode/fs_foreachinode.c * * Copyright (C) 2012-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/fs/inode/fs_inode.c b/fs/inode/fs_inode.c index 3eb89ab4f78..bcb0d285490 100644 --- a/fs/inode/fs_inode.c +++ b/fs/inode/fs_inode.c @@ -1,5 +1,5 @@ /**************************************************************************** - * fs/fs_inode.c + * fs/inode/fs_inode.c * * Copyright (C) 2007-2009, 2011-2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/fs/inode/fs_inodeaddref.c b/fs/inode/fs_inodeaddref.c index b5c14e0b06a..c0365dfcada 100644 --- a/fs/inode/fs_inodeaddref.c +++ b/fs/inode/fs_inodeaddref.c @@ -1,5 +1,5 @@ /**************************************************************************** - * fs/fs_inodeaddref.c + * fs/inode/fs_inodeaddref.c * * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/fs/inode/fs_inodebasename.c b/fs/inode/fs_inodebasename.c index 4fa78e028fc..d2a2ad46fef 100644 --- a/fs/inode/fs_inodebasename.c +++ b/fs/inode/fs_inodebasename.c @@ -1,5 +1,5 @@ /**************************************************************************** - * fs/fs_basename.c + * fs/inode/fs_basename.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/fs/inode/fs_inodefind.c b/fs/inode/fs_inodefind.c index 88f34c87de9..d91567b9132 100644 --- a/fs/inode/fs_inodefind.c +++ b/fs/inode/fs_inodefind.c @@ -1,5 +1,5 @@ /**************************************************************************** - * fs/fs_inodefind.c + * fs/inode/fs_inodefind.c * * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/fs/inode/fs_inoderelease.c b/fs/inode/fs_inoderelease.c index 5fef133deb7..134a59ce254 100644 --- a/fs/inode/fs_inoderelease.c +++ b/fs/inode/fs_inoderelease.c @@ -1,5 +1,5 @@ /**************************************************************************** - * fs_inoderelease.c + * fs/inode/fs_inoderelease.c * * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/fs/inode/fs_inoderemove.c b/fs/inode/fs_inoderemove.c index 9cc6e0907cd..b78bf651c56 100644 --- a/fs/inode/fs_inoderemove.c +++ b/fs/inode/fs_inoderemove.c @@ -1,5 +1,5 @@ /**************************************************************************** - * fs/fs_inoderemove.c + * fs/inode/fs_inoderemove.c * * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/fs/inode/fs_inodereserve.c b/fs/inode/fs_inodereserve.c index 72d2ff0311f..563be7f76bf 100644 --- a/fs/inode/fs_inodereserve.c +++ b/fs/inode/fs_inodereserve.c @@ -1,5 +1,5 @@ /**************************************************************************** - * fs/fs_registerreserve.c + * fs/inode/fs_registerreserve.c * * Copyright (C) 2007-2009, 2011-2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt