From: "Josef 'Jeff' Sipek" <jsipek@cs.sunysb.edu>
To: linux-kernel@vger.kernel.org
Cc: torvalds@osdl.org, akpm@osdl.org, hch@infradead.org,
viro@ftp.linux.org.uk, linux-fsdevel@vger.kernel.org,
mhalcrow@us.ibm.com, Josef "Jeff" Sipek <jsipek@cs.sunysb.edu>
Subject: [PATCH 03/35] eCryptfs: Use fsstack's generic copy inode attr functions
Date: Mon, 4 Dec 2006 07:30:36 -0500 [thread overview]
Message-ID: <11652354681162-git-send-email-jsipek@cs.sunysb.edu> (raw)
In-Reply-To: <1165235468365-git-send-email-jsipek@cs.sunysb.edu>
From: Josef "Jeff" Sipek <jsipek@cs.sunysb.edu>
Replace eCryptfs specific code & calls with the more generic fsstack
equivalents and remove the eCryptfs specific functions.
Signed-off-by: Josef "Jeff" Sipek <jsipek@cs.sunysb.edu>
Cc: Michael Halcrow <mhalcrow@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
fs/ecryptfs/file.c | 3 +-
fs/ecryptfs/inode.c | 75 +++++++++++++--------------------------------------
fs/ecryptfs/main.c | 5 ++-
3 files changed, 24 insertions(+), 59 deletions(-)
diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c
index a92ef05..a961a0c 100644
--- a/fs/ecryptfs/file.c
+++ b/fs/ecryptfs/file.c
@@ -30,6 +30,7 @@
#include <linux/security.h>
#include <linux/smp_lock.h>
#include <linux/compat.h>
+#include <linux/fs_stack.h>
#include "ecryptfs_kernel.h"
/**
@@ -192,7 +193,7 @@ retry:
goto retry;
file->f_pos = lower_file->f_pos;
if (rc >= 0)
- ecryptfs_copy_attr_atime(inode, lower_file->f_dentry->d_inode);
+ fsstack_copy_attr_atime(inode, lower_file->f_dentry->d_inode);
return rc;
}
diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
index dfcc684..3e2a786 100644
--- a/fs/ecryptfs/inode.c
+++ b/fs/ecryptfs/inode.c
@@ -30,6 +30,7 @@
#include <linux/namei.h>
#include <linux/mount.h>
#include <linux/crypto.h>
+#include <linux/fs_stack.h>
#include "ecryptfs_kernel.h"
static struct dentry *lock_parent(struct dentry *dentry)
@@ -53,48 +54,6 @@ static void unlock_dir(struct dentry *di
dput(dir);
}
-void ecryptfs_copy_inode_size(struct inode *dst, const struct inode *src)
-{
- i_size_write(dst, i_size_read((struct inode *)src));
- dst->i_blocks = src->i_blocks;
-}
-
-void ecryptfs_copy_attr_atime(struct inode *dest, const struct inode *src)
-{
- dest->i_atime = src->i_atime;
-}
-
-static void ecryptfs_copy_attr_times(struct inode *dest,
- const struct inode *src)
-{
- dest->i_atime = src->i_atime;
- dest->i_mtime = src->i_mtime;
- dest->i_ctime = src->i_ctime;
-}
-
-static void ecryptfs_copy_attr_timesizes(struct inode *dest,
- const struct inode *src)
-{
- dest->i_atime = src->i_atime;
- dest->i_mtime = src->i_mtime;
- dest->i_ctime = src->i_ctime;
- ecryptfs_copy_inode_size(dest, src);
-}
-
-void ecryptfs_copy_attr_all(struct inode *dest, const struct inode *src)
-{
- dest->i_mode = src->i_mode;
- dest->i_nlink = src->i_nlink;
- dest->i_uid = src->i_uid;
- dest->i_gid = src->i_gid;
- dest->i_rdev = src->i_rdev;
- dest->i_atime = src->i_atime;
- dest->i_mtime = src->i_mtime;
- dest->i_ctime = src->i_ctime;
- dest->i_blkbits = src->i_blkbits;
- dest->i_flags = src->i_flags;
-}
-
/**
* ecryptfs_create_underlying_file
* @lower_dir_inode: inode of the parent in the lower fs of the new file
@@ -171,8 +130,8 @@ ecryptfs_do_create(struct inode *directo
ecryptfs_printk(KERN_ERR, "Failure in ecryptfs_interpose\n");
goto out_lock;
}
- ecryptfs_copy_attr_timesizes(directory_inode,
- lower_dir_dentry->d_inode);
+ fsstack_copy_attr_times(directory_inode, lower_dir_dentry->d_inode);
+ fsstack_copy_inode_size(directory_inode, lower_dir_dentry->d_inode);
out_lock:
unlock_dir(lower_dir_dentry);
out:
@@ -365,7 +324,7 @@ static struct dentry *ecryptfs_lookup(st
"d_name.name = [%s]\n", lower_dentry,
lower_dentry->d_name.name);
lower_inode = lower_dentry->d_inode;
- ecryptfs_copy_attr_atime(dir, lower_dir_dentry->d_inode);
+ fsstack_copy_attr_atime(dir, lower_dir_dentry->d_inode);
BUG_ON(!atomic_read(&lower_dentry->d_count));
ecryptfs_set_dentry_private(dentry,
kmem_cache_alloc(ecryptfs_dentry_info_cache,
@@ -462,7 +421,8 @@ static int ecryptfs_link(struct dentry *
rc = ecryptfs_interpose(lower_new_dentry, new_dentry, dir->i_sb, 0);
if (rc)
goto out_lock;
- ecryptfs_copy_attr_timesizes(dir, lower_new_dentry->d_inode);
+ fsstack_copy_attr_times(dir, lower_new_dentry->d_inode);
+ fsstack_copy_inode_size(dir, lower_new_dentry->d_inode);
old_dentry->d_inode->i_nlink =
ecryptfs_inode_to_lower(old_dentry->d_inode)->i_nlink;
i_size_write(new_dentry->d_inode, file_size_save);
@@ -488,7 +448,7 @@ static int ecryptfs_unlink(struct inode
printk(KERN_ERR "Error in vfs_unlink; rc = [%d]\n", rc);
goto out_unlock;
}
- ecryptfs_copy_attr_times(dir, lower_dir_inode);
+ fsstack_copy_attr_times(dir, lower_dir_inode);
dentry->d_inode->i_nlink =
ecryptfs_inode_to_lower(dentry->d_inode)->i_nlink;
dentry->d_inode->i_ctime = dir->i_ctime;
@@ -527,7 +487,8 @@ static int ecryptfs_symlink(struct inode
rc = ecryptfs_interpose(lower_dentry, dentry, dir->i_sb, 0);
if (rc)
goto out_lock;
- ecryptfs_copy_attr_timesizes(dir, lower_dir_dentry->d_inode);
+ fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode);
+ fsstack_copy_inode_size(dir, lower_dir_dentry->d_inode);
out_lock:
unlock_dir(lower_dir_dentry);
dput(lower_dentry);
@@ -550,7 +511,8 @@ static int ecryptfs_mkdir(struct inode *
rc = ecryptfs_interpose(lower_dentry, dentry, dir->i_sb, 0);
if (rc)
goto out;
- ecryptfs_copy_attr_timesizes(dir, lower_dir_dentry->d_inode);
+ fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode);
+ fsstack_copy_inode_size(dir, lower_dir_dentry->d_inode);
dir->i_nlink = lower_dir_dentry->d_inode->i_nlink;
out:
unlock_dir(lower_dir_dentry);
@@ -573,7 +535,7 @@ static int ecryptfs_rmdir(struct inode *
dput(lower_dentry);
if (!rc)
d_delete(lower_dentry);
- ecryptfs_copy_attr_times(dir, lower_dir_dentry->d_inode);
+ fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode);
dir->i_nlink = lower_dir_dentry->d_inode->i_nlink;
unlock_dir(lower_dir_dentry);
if (!rc)
@@ -597,7 +559,8 @@ ecryptfs_mknod(struct inode *dir, struct
rc = ecryptfs_interpose(lower_dentry, dentry, dir->i_sb, 0);
if (rc)
goto out;
- ecryptfs_copy_attr_timesizes(dir, lower_dir_dentry->d_inode);
+ fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode);
+ fsstack_copy_inode_size(dir, lower_dir_dentry->d_inode);
out:
unlock_dir(lower_dir_dentry);
if (!dentry->d_inode)
@@ -626,9 +589,9 @@ ecryptfs_rename(struct inode *old_dir, s
lower_new_dir_dentry->d_inode, lower_new_dentry);
if (rc)
goto out_lock;
- ecryptfs_copy_attr_all(new_dir, lower_new_dir_dentry->d_inode);
+ fsstack_copy_attr_all(new_dir, lower_new_dir_dentry->d_inode);
if (new_dir != old_dir)
- ecryptfs_copy_attr_all(old_dir, lower_old_dir_dentry->d_inode);
+ fsstack_copy_attr_all(old_dir, lower_old_dir_dentry->d_inode);
out_lock:
unlock_rename(lower_old_dir_dentry, lower_new_dir_dentry);
dput(lower_new_dentry->d_parent);
@@ -684,8 +647,8 @@ ecryptfs_readlink(struct dentry *dentry,
rc = -EFAULT;
}
kfree(decoded_name);
- ecryptfs_copy_attr_atime(dentry->d_inode,
- lower_dentry->d_inode);
+ fsstack_copy_attr_atime(dentry->d_inode,
+ lower_dentry->d_inode);
}
out_free_lower_buf:
kfree(lower_buf);
@@ -915,7 +878,7 @@ static int ecryptfs_setattr(struct dentr
}
rc = notify_change(lower_dentry, ia);
out:
- ecryptfs_copy_attr_all(inode, lower_inode);
+ fsstack_copy_attr_all(inode, lower_inode);
return rc;
}
diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c
index a78d87d..5982931 100644
--- a/fs/ecryptfs/main.c
+++ b/fs/ecryptfs/main.c
@@ -35,6 +35,7 @@
#include <linux/pagemap.h>
#include <linux/key.h>
#include <linux/parser.h>
+#include <linux/fs_stack.h>
#include "ecryptfs_kernel.h"
/**
@@ -112,10 +113,10 @@ int ecryptfs_interpose(struct dentry *lo
d_add(dentry, inode);
else
d_instantiate(dentry, inode);
- ecryptfs_copy_attr_all(inode, lower_inode);
+ fsstack_copy_attr_all(inode, lower_inode);
/* This size will be overwritten for real files w/ headers and
* other metadata */
- ecryptfs_copy_inode_size(inode, lower_inode);
+ fsstack_copy_inode_size(inode, lower_inode);
out:
return rc;
}
--
1.4.3.3
next prev parent reply other threads:[~2006-12-04 12:34 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-04 12:30 Unionfs: Stackable namespace unification filesystem Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 01/35] fsstack: Introduce fsstack_copy_{attr,inode}_* Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 02/35] fsstack: Remove unneeded wrapper Josef 'Jeff' Sipek
2006-12-04 12:30 ` Josef 'Jeff' Sipek [this message]
2006-12-04 12:30 ` [PATCH 04/35] fsstack: Fix up eCryptfs compilation Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 05/35] struct path: Rename Reiserfs's struct path Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 06/35] struct path: Rename DM's " Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 07/35] struct path: Move struct path from fs/namei.c into include/linux Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 08/35] struct path: make eCryptfs a user of struct path Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 09/35] fs/stack.c should #include <linux/fs_stack.h> Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 10/35] fsstack: Make fsstack_copy_attr_all copy inode size Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 11/35] fsstack: Fix up ecryptfs's fsstack usage Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 12/35] Unionfs: Documentation Josef 'Jeff' Sipek
2006-12-05 20:52 ` Jan Engelhardt
2006-12-04 12:30 ` [PATCH 13/35] lookup_one_len_nd - lookup_one_len with nameidata argument Josef 'Jeff' Sipek
2006-12-05 20:53 ` Jan Engelhardt
2006-12-04 12:30 ` [PATCH 14/35] Unionfs: Branch management functionality Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 15/35] Unionfs: Common file operations Josef 'Jeff' Sipek
2006-12-05 21:02 ` Jan Engelhardt
2006-12-08 4:16 ` Josef Sipek
2006-12-08 10:51 ` Jan Engelhardt
2006-12-04 12:30 ` [PATCH 16/35] Unionfs: Copyup Functionality Josef 'Jeff' Sipek
2006-12-05 21:09 ` Jan Engelhardt
2006-12-08 4:43 ` Josef Sipek
2006-12-04 12:30 ` [PATCH 17/35] Unionfs: Dentry operations Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 18/35] Unionfs: File operations Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 19/35] Unionfs: Directory file operations Josef 'Jeff' Sipek
2006-12-05 21:17 ` Jan Engelhardt
2006-12-04 12:30 ` [PATCH 20/35] Unionfs: Directory manipulation helper functions Josef 'Jeff' Sipek
2006-12-05 21:21 ` Jan Engelhardt
2006-12-04 12:30 ` [PATCH 21/35] Unionfs: Inode operations Josef 'Jeff' Sipek
2006-12-05 21:27 ` Jan Engelhardt
2006-12-05 21:50 ` Andrew Morton
2006-12-05 21:53 ` David Miller
2006-12-06 4:12 ` Randy Dunlap
2006-12-07 14:04 ` Theodore Tso
2006-12-07 17:07 ` Andrew Morton
2006-12-07 22:42 ` Randy Dunlap
2006-12-04 12:30 ` [PATCH 22/35] Unionfs: Lookup helper functions Josef 'Jeff' Sipek
2006-12-05 21:29 ` Jan Engelhardt
2006-12-04 12:30 ` [PATCH 23/35] Unionfs: Main module functions Josef 'Jeff' Sipek
2006-12-05 21:32 ` Jan Engelhardt
2006-12-04 12:30 ` [PATCH 24/35] Unionfs: Readdir state Josef 'Jeff' Sipek
2006-12-05 21:40 ` Jan Engelhardt
2006-12-04 12:30 ` [PATCH 25/35] Unionfs: Rename Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 26/35] Unionfs: Privileged operations workqueue Josef 'Jeff' Sipek
2006-12-05 19:27 ` Jan Engelhardt
2006-12-05 19:50 ` Josef Sipek
2006-12-06 17:32 ` Josef Sipek
2006-12-06 18:46 ` Jan Engelhardt
2006-12-08 2:17 ` Josef Sipek
2006-12-08 10:38 ` Jan Engelhardt
2006-12-08 16:00 ` Josef Sipek
2006-12-08 17:02 ` Jan Engelhardt
2006-12-08 17:43 ` Josef Sipek
2006-12-08 18:03 ` Jan Engelhardt
2006-12-08 18:24 ` Josef Sipek
2006-12-04 12:31 ` [PATCH 27/35] Unionfs: Handling of stale inodes Josef 'Jeff' Sipek
2006-12-04 12:31 ` [PATCH 28/35] Unionfs: Miscellaneous helper functions Josef 'Jeff' Sipek
2006-12-04 12:31 ` [PATCH 29/35] Unionfs: Superblock operations Josef 'Jeff' Sipek
2006-12-07 10:59 ` Jan Engelhardt
2006-12-04 12:31 ` [PATCH 30/35] Unionfs: Helper macros/inlines Josef 'Jeff' Sipek
2006-12-07 11:00 ` Jan Engelhardt
2006-12-04 12:31 ` [PATCH 31/35] Unionfs: Internal include file Josef 'Jeff' Sipek
2006-12-05 19:41 ` Jan Engelhardt
2006-12-04 12:31 ` [PATCH 32/35] Unionfs: Include file Josef 'Jeff' Sipek
2006-12-07 11:01 ` Jan Engelhardt
2006-12-04 12:31 ` [PATCH 33/35] Unionfs: Unlink Josef 'Jeff' Sipek
2006-12-04 12:31 ` [PATCH 34/35] Unionfs: Kconfig and Makefile Josef 'Jeff' Sipek
2006-12-04 12:31 ` [PATCH 35/35] Unionfs: Extended Attributes support Josef 'Jeff' Sipek
2006-12-07 11:04 ` Jan Engelhardt
2006-12-08 5:35 ` Josef Sipek
2006-12-08 10:53 ` Jan Engelhardt
2006-12-05 15:13 ` Unionfs: Stackable namespace unification filesystem Josef Sipek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=11652354681162-git-send-email-jsipek@cs.sunysb.edu \
--to=jsipek@cs.sunysb.edu \
--cc=akpm@osdl.org \
--cc=hch@infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mhalcrow@us.ibm.com \
--cc=torvalds@osdl.org \
--cc=viro@ftp.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).