commit 93e2e539fbf65dbc3bb7863647ddb2af570f5456
Merge: 62ad7c2... fcc58b3...
Author: Yiannis Pericleous <[EMAIL PROTECTED]>
Date: Sat May 5 18:22:37 2007 -0400
Merge branch 'master' of story:/home/git/unionfs-odf into odf
diff --git a/fs/unionfs/file.c b/fs/unionfs/file.c
index
c30dd8adb8f0fd7725fe0e45c7845084b9581ba1..2bfc1f67aa965f4c65d05c6cd84d78c22061636a
100644
--- a/fs/unionfs/file.c
+++ b/fs/unionfs/file.c
@@ -99,7 +99,7 @@ static int unionfs_mmap(struct file *fil
err = generic_file_mmap(file, vma);
if (err)
- printk("mmap: generic_file_mmap failed %d\n", err);
+ printk("unionfs: generic_file_mmap failed %d\n", err);
out:
unionfs_read_unlock(file->f_dentry->d_sb);
diff --git a/fs/unionfs/mmap.c b/fs/unionfs/mmap.c
index
99b3b2f9e9f1072ede3d0dd490401f9a1ab3b5ab..f484984ff33f492c0b79b4807b99a76597ea7cc7
100644
--- a/fs/unionfs/mmap.c
+++ b/fs/unionfs/mmap.c
@@ -114,10 +114,10 @@ int unionfs_do_readpage(struct file *fil
wait_on_page_locked(lower_page);
if (!PageUptodate(lower_page)) {
/*
- * call readpage() again if we returned from wait_on_page with a
- * page that's not up-to-date; that can happen when a partial
- * page has a few buffers which are ok, but not the whole
- * page.
+ * call readpage() again if we returned from wait_on_page
+ * with a page that's not up-to-date; that can happen when a
+ * partial page has a few buffers which are ok, but not the
+ * whole page.
*/
lock_page(lower_page);
err = lower_inode->i_mapping->a_ops->readpage(lower_file,
@@ -168,9 +168,9 @@ int unionfs_readpage(struct file *file,
err = unionfs_do_readpage(file, page);
/*
- * we have to unlock our page, b/c we _might_ have gotten a locked page.
- * but we no longer have to wakeup on our page here, b/c UnlockPage does
- * it
+ * we have to unlock our page, b/c we _might_ have gotten a locked
+ * page. but we no longer have to wakeup on our page here, b/c
+ * UnlockPage does it
*/
out_err:
@@ -255,14 +255,13 @@ sector_t unionfs_bmap(struct address_spa
{
int err = 0;
struct inode *inode, *lower_inode;
+ sector_t (*bmap)(struct address_space *, sector_t);
inode = (struct inode *)mapping->host;
lower_inode = unionfs_lower_inode(inode);
-
- if (lower_inode->i_mapping->a_ops->bmap)
- err =
- lower_inode->i_mapping->a_ops->bmap(lower_inode->i_mapping,
- block);
+ bmap = lower_inode->i_mapping->a_ops->bmap;
+ if (bmap)
+ err = bmap(lower_inode->i_mapping, block);
return err;
}
@@ -301,4 +300,3 @@ struct address_space_operations unionfs_
.bmap = unionfs_bmap,
.sync_page = unionfs_sync_page,
};
-
diff --git a/fs/unionfs/super.c b/fs/unionfs/super.c
index
def4f623037085f13b8b5028e4d5d02b4613fd01..593d70a83d6b3d30071338f645ce43f18c00851d
100644
--- a/fs/unionfs/super.c
+++ b/fs/unionfs/super.c
@@ -848,8 +848,7 @@ static void init_once(void *v, struct km
{
struct unionfs_inode_info *i = v;
- if ((flags & (SLAB_CTOR_VERIFY | SLAB_CTOR_CONSTRUCTOR)) ==
- SLAB_CTOR_CONSTRUCTOR)
+ if (flags & SLAB_CTOR_CONSTRUCTOR)
inode_init_once(&i->vfs_inode);
}
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs
