Menu
▾
▴
[Kdfs-commits] [kernel]kdfs branch, make_kdfs_compile, updated. 3a01e00aeeeb7e3f4a2026d46598692a0feb4c8f
|
From: Marko O. <d0...@us...> - 2009-10-20 14:58:24
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "kdfs".
The branch, make_kdfs_compile has been updated
via 3a01e00aeeeb7e3f4a2026d46598692a0feb4c8f (commit)
via 431f64eadaf0d907981b11167177d3e78333fafc (commit)
from 32569709409a6f590c3a367fd3f6f714b6c0d931 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3a01e00aeeeb7e3f4a2026d46598692a0feb4c8f
Author: Marko Obrovac <mar...@in...>
Date: Tue Oct 20 14:52:38 2009 +0000
[FIX] Change the makefile to conform to new compiling rules (kdfs is now
built in the kernel, not a module)
diff --git a/fs/kdfs/Makefile b/fs/kdfs/Makefile
index ca9d271..f59b146 100644
--- a/fs/kdfs/Makefile
+++ b/fs/kdfs/Makefile
@@ -1,7 +1 @@
-obj-m += krgbuiltin.o
-
-
-krgbuiltin-objs := physical_fs.o super.o inode.o dir.o file.o address_space.o extent.o cow.o
-krgbuiltin-objs += $(krgbuiltin-y)
-
-EXTRA_CFLAGS += -I$(M)
+obj-y := physical_fs.o super.o inode.o dir.o file.o address_space.o extent.o cow.o
commit 431f64eadaf0d907981b11167177d3e78333fafc
Author: Marko Obrovac <mar...@in...>
Date: Tue Oct 20 14:51:37 2009 +0000
[FIX] fixed name clashes with the kerrighed functions (and marked all
the internal functions as internal)
diff --git a/fs/kdfs/physical_fs.c b/fs/kdfs/physical_fs.c
index 0ae67a8..c299877 100644
--- a/fs/kdfs/physical_fs.c
+++ b/fs/kdfs/physical_fs.c
@@ -24,7 +24,7 @@
#define KDFS_PART "KDFS - Native File System Accesses"
-void chroot_to_physical_root(struct path *saved_root)
+void __change_to_physical_root(struct path *saved_root)
{
write_lock(¤t->fs->lock);
*saved_root = current->fs->root;
@@ -32,7 +32,7 @@ void chroot_to_physical_root(struct path *saved_root)
write_unlock(¤t->fs->lock);
}
-void chroot_to_saved_root(const struct path *saved_root)
+void __change_to_saved_root(const struct path *saved_root)
{
struct path root;
@@ -43,7 +43,7 @@ void chroot_to_saved_root(const struct path *saved_root)
path_put(&root);
}
-int change_creds(struct cred **overridden, const struct cred **old,
+int __change_creds(struct cred **overridden, const struct cred **old,
uid_t fsuid, gid_t fsgid)
{
*overridden = prepare_creds();
@@ -57,7 +57,7 @@ int change_creds(struct cred **overridden, const struct cred **old,
return 0;
}
-void revert_old_creds(struct cred *overridden, const struct cred *old)
+void __revert_old_creds(struct cred *overridden, const struct cred *old)
{
revert_creds(old);
put_cred(overridden);
@@ -90,11 +90,11 @@ long create_phys_dir(const char *pathname,
DEBUG(DBG_INFO, "Create dir %s\n", pathname);
- error = change_creds(&overridden_creds, &old_creds, uid, gid);
+ error = __change_creds(&overridden_creds, &old_creds, uid, gid);
if (error)
goto out;
- chroot_to_physical_root(&saved_path);
+ __change_to_physical_root(&saved_path);
error = path_lookup(pathname, LOOKUP_PARENT, &nd);
if (error)
@@ -124,8 +124,8 @@ long create_phys_dir(const char *pathname,
path_put(&nd.path);
out:
- chroot_to_saved_root(&saved_path);
- revert_old_creds(overridden_creds, old_creds);
+ __change_to_saved_root(&saved_path);
+ __revert_old_creds(overridden_creds, old_creds);
return error;
}
@@ -154,11 +154,11 @@ long remove_phys_dir(const char *pathname, uid_t uid, gid_t gid)
DEBUG(DBG_TRACE, "Remove dir %s\n", pathname);
- res = change_creds(&overridden_creds, &old_creds, uid, gid);
+ res = __change_creds(&overridden_creds, &old_creds, uid, gid);
if (res)
goto out;
- chroot_to_physical_root(&saved_path);
+ __change_to_physical_root(&saved_path);
file = filp_open(pathname, O_LARGEFILE|O_RDONLY, 0644);
if (IS_ERR(file) && PTR_ERR(file) == -ENOENT) {
@@ -184,8 +184,8 @@ long remove_phys_dir(const char *pathname, uid_t uid, gid_t gid)
filp_close(file,current->files);
out:
- chroot_to_saved_root(&saved_path);
- revert_old_creds(overridden_creds, old_creds);
+ __change_to_saved_root(&saved_path);
+ __revert_old_creds(overridden_creds, old_creds);
return res;
}
@@ -213,11 +213,11 @@ struct file *open_phys_file(char *filename, int flags, int mode, uid_t uid, gid_
const struct cred *old_creds;
struct cred *overridden_creds;
- error = change_creds(&overridden_creds, &old_creds, uid, gid);
+ error = __change_creds(&overridden_creds, &old_creds, uid, gid);
if (error)
goto out;
- chroot_to_physical_root(&saved_path);
+ __change_to_physical_root(&saved_path);
DEBUG(DBG_INFO,
"Open physical file %s with flags 0x%08x - mode %o\n",
@@ -230,8 +230,8 @@ struct file *open_phys_file(char *filename, int flags, int mode, uid_t uid, gid_
DEBUG(DBG_INFO, "Open physical file %s done : %p\n", filename, file);
out:
- chroot_to_saved_root(&saved_path);
- revert_old_creds(overridden_creds, old_creds);
+ __change_to_saved_root(&saved_path);
+ __revert_old_creds(overridden_creds, old_creds);
if (error)
file = ERR_PTR(error);
@@ -417,11 +417,11 @@ int remove_phys_file(const char *filename, uid_t uid, gid_t gid)
DEBUG(DBG_TRACE, "Remove file %s\n", filename);
- res = change_creds(&overridden_creds, &old_creds, uid, gid);
+ res = __change_creds(&overridden_creds, &old_creds, uid, gid);
if (res)
goto out;
- chroot_to_physical_root(&saved_path);
+ __change_to_physical_root(&saved_path);
file = filp_open(filename, O_LARGEFILE|O_RDONLY, 0644);
@@ -448,8 +448,8 @@ int remove_phys_file(const char *filename, uid_t uid, gid_t gid)
DEBUG(DBG_INFO, "After vfs_unlink res = %d\n", res);
out:
- chroot_to_saved_root(&saved_path);
- revert_old_creds(overridden_creds, old_creds);
+ __change_to_saved_root(&saved_path);
+ __revert_old_creds(overridden_creds, old_creds);
return res;
}
-----------------------------------------------------------------------
Summary of changes:
fs/kdfs/Makefile | 8 +-------
fs/kdfs/physical_fs.c | 40 ++++++++++++++++++++--------------------
2 files changed, 21 insertions(+), 27 deletions(-)
hooks/post-receive
--
kdfs
|
