commit e2fe904f63f0f0bd5746b2b74cc6a722837b82a5
Author: Yiannis Pericleous <[EMAIL PROTECTED]>
Date: Sat May 19 17:15:54 2007 -0400
fixed some minor issues after applying erez's patches
diff --git a/fs/unionfs/commonfops.c b/fs/unionfs/commonfops.c
index 0b4909a..5d552d3 100644
--- a/fs/unionfs/commonfops.c
+++ b/fs/unionfs/commonfops.c
@@ -681,7 +681,6 @@ int unionfs_file_release(struct inode *inode, struct file
*file)
{
struct file *hidden_file = NULL;
struct unionfs_file_info *fileinfo = UNIONFS_F(file);
- struct unionfs_inode_info *inodeinfo = UNIONFS_I(inode);
struct super_block *sb = inode->i_sb;
int bindex, bstart, bend;
int fgen, err = 0;
diff --git a/fs/unionfs/file.c b/fs/unionfs/file.c
index 5e34f6e..7e7cbf8 100644
--- a/fs/unionfs/file.c
+++ b/fs/unionfs/file.c
@@ -57,9 +57,6 @@ static ssize_t unionfs_aio_read(struct kiocb *iocb, const
struct iovec *iov,
touch_atime(unionfs_lower_mnt(iocb->ki_filp->f_path.dentry),
unionfs_lower_dentry(iocb->ki_filp->f_path.dentry));
-out:
- unionfs_read_unlock(file->f_dentry->d_sb);
- unionfs_check_file(file);
return err;
}
static ssize_t unionfs_write(struct file * file, const char __user * buf,
diff --git a/fs/unionfs/odf.c b/fs/unionfs/odf.c
index 224cbf1..1cd47da 100644
--- a/fs/unionfs/odf.c
+++ b/fs/unionfs/odf.c
@@ -775,7 +775,8 @@ skip:
verify_locked(dentry->d_parent);
unionfs_unlock_dentry(dentry->d_parent); /*XXX: this is VERY
nasty */
lower_dentry = create_parents(dentry->d_parent->d_inode,
- dentry, branch_dst);
+ dentry, dentry->d_name.name,
+ branch_dst);
unionfs_lock_dentry(dentry->d_parent);
if (!lower_dentry || IS_ERR(lower_dentry)) {
diff --git a/fs/unionfs/rename.c b/fs/unionfs/rename.c
index f952b8d..b5b0ccf 100644
--- a/fs/unionfs/rename.c
+++ b/fs/unionfs/rename.c
@@ -30,7 +30,8 @@ int copyup_empty_dir(struct inode *parent, struct dentry
*dentry, int mode)
hidden_dentry = unionfs_lower_dentry_idx(dentry, bindex);
if (!hidden_dentry) {
- hidden_dentry = create_parents(parent, dentry, bindex);
+ hidden_dentry = create_parents(parent, dentry,
+ dentry->d_name.name, bindex);
if (!hidden_dentry || IS_ERR(hidden_dentry)) {
printk(KERN_DEBUG "hidden dentry NULL for "
"bindex = %d\n", bindex);
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs
