commit 77f2894d0ef3273eee347be3df6cb353f1b5904c
Author: Yiannis Pericleous <[EMAIL PROTECTED]>
Date: Sat Apr 21 11:30:56 2007 -0400
cleanup: remove trailing spaces
Conflicts:
fs/unionfs/super.c
diff --git a/fs/unionfs/inode.c b/fs/unionfs/inode.c
index 7edeeb6..bf1c57a 100644
--- a/fs/unionfs/inode.c
+++ b/fs/unionfs/inode.c
@@ -576,7 +576,7 @@ static void unionfs_put_link(struct dentry *dentry, struct
nameidata *nd,
/* Basically copied from the kernel vfs permission(), but we've changed
* the following:
- * (1) the IS_RDONLY check is skipped, and
+ * (1) the IS_RDONLY check is skipped, and
* (2) if you set the mount option `mode=nfsro', we assume that -EACCES
* means that the export is read-only and we should check standard Unix
* permissions. This means that NFS ACL checks (or other advanced
diff --git a/fs/unionfs/lookup.c b/fs/unionfs/lookup.c
index a246af0..de89d1a 100644
--- a/fs/unionfs/lookup.c
+++ b/fs/unionfs/lookup.c
@@ -216,7 +216,7 @@ out_negative:
err = PTR_ERR(first_hidden_dentry);
goto out;
}
-
+
/* FIXME: the following line needs to be changed to allow
* mountpoint crossing
*/
diff --git a/fs/unionfs/main.c b/fs/unionfs/main.c
index 4a6f81a..6634126 100644
--- a/fs/unionfs/main.c
+++ b/fs/unionfs/main.c
@@ -510,7 +510,7 @@ out:
return hidden_root_info;
}
-/* our custom d_alloc_root workalike
+/* our custom d_alloc_root workalike
*
* we can't use d_alloc_root if we want to use our own interpose function
* unchanged, so we simply call our own "fake" d_alloc_root
diff --git a/fs/unionfs/rdstate.c b/fs/unionfs/rdstate.c
index b67a86a..2265031 100644
--- a/fs/unionfs/rdstate.c
+++ b/fs/unionfs/rdstate.c
@@ -87,7 +87,7 @@ int init_rdstate(struct file *file)
UNIONFS_F(file)->rdstate = alloc_rdstate(file->f_dentry->d_inode,
fbstart(file));
-
+
return (UNIONFS_F(file)->rdstate ? 0 : -ENOMEM);
}
diff --git a/fs/unionfs/union.h b/fs/unionfs/union.h
index 214b37e..5d01713 100644
--- a/fs/unionfs/union.h
+++ b/fs/unionfs/union.h
@@ -138,7 +138,7 @@ struct unionfs_inode_info {
int rdcount;
int hashsize;
int cookie;
-
+
/* The hidden inodes */
struct inode **lower_inodes;
/* to keep track of reads/writes for unlinks before closes */
@@ -193,8 +193,8 @@ struct filldir_node {
/* we can check for duplicate whiteouts and files in the same branch
* in order to return -EIO.
- */
- int bindex;
+ */
+ int bindex;
/* is this a whiteout entry? */
int whiteout;
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs
