commit 7752ef53d423a83fac198dc0eb255fc099759ed4
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
a3a11283c1ec36c612dfdbe14bb5c6627af91a2f..bdd315d2084117b93b37f7c03b1c8ab2c04b8615
100644
--- a/fs/unionfs/inode.c
+++ b/fs/unionfs/inode.c
@@ -577,7 +577,7 @@ static void unionfs_put_link(struct dent
/* 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
f51a027c4d55b7c43d908778078b11b88a31b3a1..e5a28f1d47a292664306ed67ab56aae375e10eff
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
4a6f81a8603ec06e253c74c5858bd4d5c3b602b5..663412630492d2d65479129833350273a98f3906
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
b67a86a99a06437b7f68cda8c3566e2db569d63a..2265031923545c32748cd98c5f5d28041916d050
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
b63e23e648146068a473e5be478d6c209b67c195..fa28059b664887b95371368d959ae1c03c85d3ca
100644
--- a/fs/unionfs/union.h
+++ b/fs/unionfs/union.h
@@ -127,7 +127,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 */
@@ -182,8 +182,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
