The following is a series of patches related to Unionfs. Aside from a few minor cleanups/fixes, the two main changes are (1) lower nameidata support so we can stack on nfsv4, and (2) un/likely optimizations. These patches were tested (where appropriate) on our 2.6.23-rc8 latest code, as well as the backports to 2.6.{22,21,20,19,18,9} on ext2/3/4, xfs, reiserfs, nfs2/3/4, jffs2, ramfs, tmpfs, cramfs, and squashfs (where available). See http://unionfs.filesystems.org/ to download backported unionfs...

This also fixes a compile warning on 64-bit systems. Signed-off-by: Josef 'Jeff' Sipek <jsipek@cs.sunysb.edu> Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu> --- fs/unionfs/debug.c | 16 ++++++---------- fs/unionfs/union.h | 1 + 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/fs/unionfs/debug.c b/fs/unionfs/debug.c index 09b52ce..b103eb9 100644 --- a/fs/unionfs/debug.c +++ b/fs/unionfs/debug.c @@ -25,14 +25,6 @@ } \ } while (0) -#if BITS_PER_LO...

From: Josef 'Jeff' Sipek <jsipek@cs.sunysb.edu> Since we set the right value for d_type in readdir, there's really no point in having to calculate the number of directory links. Some on-disk filesystems don't even store the number of links for directories. Signed-off-by: Josef 'Jeff' Sipek <jsipek@cs.sunysb.edu> Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu> --- fs/unionfs/subr.c | 41 +++++++---------------------------------- 1 files changed, 7 insertions(+), 34 deletions(-...

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu> --- fs/unionfs/main.c | 98 ++++++++++++++++++++++++++------------------------- fs/unionfs/super.c | 90 ++++++++++++++++++++++++------------------------ 2 files changed, 95 insertions(+), 93 deletions(-) diff --git a/fs/unionfs/main.c b/fs/unionfs/main.c index 8595750..82cb35a 100644 --- a/fs/unionfs/main.c +++ b/fs/unionfs/main.c @@ -32,13 +32,13 @@ static void unionfs_fill_inode(struct dentry *dentry, for (bindex = bstart; bindex ...

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu> --- fs/unionfs/inode.c | 160 ++++++++++++++++++++++++++-------------------------- 1 files changed, 80 insertions(+), 80 deletions(-) diff --git a/fs/unionfs/inode.c b/fs/unionfs/inode.c index 7ee4760..7ae4a25 100644 --- a/fs/unionfs/inode.c +++ b/fs/unionfs/inode.c @@ -35,7 +35,7 @@ static int unionfs_create(struct inode *parent, struct dentry *dentry, unionfs_lock_dentry(dentry->d_parent); valid = __unionfs_d_revalidate_chain(dentry-...

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu> --- fs/unionfs/debug.c | 108 +++++++++++++++++++++++++++------------------------ 1 files changed, 57 insertions(+), 51 deletions(-) diff --git a/fs/unionfs/debug.c b/fs/unionfs/debug.c index 9546a41..09b52ce 100644 --- a/fs/unionfs/debug.c +++ b/fs/unionfs/debug.c @@ -56,19 +56,19 @@ void __unionfs_check_inode(const struct inode *inode, sb = inode->i_sb; istart = ibstart(inode); iend = ibend(inode); - if (istart > iend) { + if...

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu> --- fs/unionfs/dentry.c | 68 ++++++++++++++++++++++++++------------------------ 1 files changed, 35 insertions(+), 33 deletions(-) diff --git a/fs/unionfs/dentry.c b/fs/unionfs/dentry.c index 52bcb18..3f3a18d 100644 --- a/fs/unionfs/dentry.c +++ b/fs/unionfs/dentry.c @@ -45,7 +45,7 @@ static bool __unionfs_d_revalidate_one(struct dentry *dentry, verify_locked(dentry); /* if the dentry is unhashed, do NOT revalidate */ - if (d_delete...

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu> --- fs/unionfs/sioq.c | 4 ++-- fs/unionfs/subr.c | 26 +++++++++++++------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/fs/unionfs/sioq.c b/fs/unionfs/sioq.c index 2a8c88e..35d9fc3 100644 --- a/fs/unionfs/sioq.c +++ b/fs/unionfs/sioq.c @@ -28,7 +28,7 @@ int __init init_sioq(void) int err; superio_workqueue = create_workqueue("unionfs_siod"); - if (!IS_ERR(superio_workqueue)) + if (unlikely(!IS_ERR(supe...

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu> --- fs/unionfs/debug.c | 6 ++++-- fs/unionfs/dentry.c | 2 +- fs/unionfs/inode.c | 14 ++++++++------ fs/unionfs/main.c | 4 ++-- fs/unionfs/union.h | 2 +- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/fs/unionfs/debug.c b/fs/unionfs/debug.c index f678534..2d15fb0 100644 --- a/fs/unionfs/debug.c +++ b/fs/unionfs/debug.c @@ -467,7 +467,8 @@ void __show_dinode_times(const struct dentry *dentry, lower_...

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu> --- fs/unionfs/debug.c | 20 ++++++++++++++++++++ fs/unionfs/dentry.c | 4 +++- fs/unionfs/inode.c | 8 +++++++- fs/unionfs/union.h | 4 ++++ 4 files changed, 34 insertions(+), 2 deletions(-) diff --git a/fs/unionfs/debug.c b/fs/unionfs/debug.c index 2d15fb0..9546a41 100644 --- a/fs/unionfs/debug.c +++ b/fs/unionfs/debug.c @@ -415,6 +415,26 @@ void __unionfs_check_file(const struct file *file, __unionfs_check_dentry(dentry,fn...

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu> --- fs/unionfs/mmap.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/fs/unionfs/mmap.c b/fs/unionfs/mmap.c index 37af979..1cea075 100644 --- a/fs/unionfs/mmap.c +++ b/fs/unionfs/mmap.c @@ -84,7 +84,7 @@ static int unionfs_writepage(struct page *page, struct writeback_control *wbc) * resort to RAIF's page pointer flipping trick.) */ lower_page = find_lock_page(lower_inode->i_mapp...

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu> --- fs/unionfs/rdstate.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/fs/unionfs/rdstate.c b/fs/unionfs/rdstate.c index 0a18d5c..7ec7f95 100644 --- a/fs/unionfs/rdstate.c +++ b/fs/unionfs/rdstate.c @@ -45,7 +45,7 @@ int unionfs_init_filldir_cache(void) void unionfs_destroy_filldir_cache(void) { - if (unionfs_filldir_cachep) + if (likely(unionfs_filldir_cachep)) kmem_cache_destroy(unionfs_fill...

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu> --- fs/unionfs/xattr.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fs/unionfs/xattr.c b/fs/unionfs/xattr.c index 7f77d7d..bd2de06 100644 --- a/fs/unionfs/xattr.c +++ b/fs/unionfs/xattr.c @@ -23,14 +23,14 @@ void *unionfs_xattr_alloc(size_t size, size_t limit) { void *ptr; - if (size > limit) + if (unlikely(size > limit)) return ERR_PTR(-E2BIG); if (!size) /* size request, no buffe...

Add a new gfp flag __GFP_VFALLBACK If specified during a higher order allocation then the system will fall back to vmap and attempt to create a virtually contiguous area instead of a physically contiguous area. In many cases the virtually contiguous area can stand in for the physically contiguous area (with some loss of performance). The pages used for VFALLBACK are marked with a new flag PageVcompound(page). The mark is necessary since we have to know upon free if we have to destroy a virtu...

This is in particular useful for large I/Os because it will allow > 100 allocs from the SLUB fast path without having to go to the page allocator. Signed-off-by: Christoph Lameter <clameter@sgi.com> --- fs/buffer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Index: linux-2.6/fs/buffer.c =================================================================== --- linux-2.6.orig/fs/buffer.c 2007-09-18 15:44:37.000000000 -0700 +++ linux-2.6/fs/buffer.c 2007-09-18 15:44:51.000...

Sparsemem currently attempts first to do a physically contiguous mapping and then falls back to vmalloc. The same thing can now be accomplished using GFP_VFALLBACK. Signed-off-by: Christoph Lameter <clameter@sgi.com> --- mm/sparse.c | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) Index: linux-2.6/mm/sparse.c =================================================================== --- linux-2.6.orig/mm/sparse.c 2007-09-19 18:05:34.000000000 -0700 +++ linux-2...

Virtual fallbacks are rare and thus subtle bugs may creep in if we do not test the fallbacks. CONFIG_VFALLBACK_ALWAYS makes all GFP_VFALLBACK allocations fall back to virtual mapping. Signed-off-by: Christoph Lameter <clameter@sgi.com> --- lib/Kconfig.debug | 11 +++++++++++ mm/page_alloc.c | 6 ++++++ 2 files changed, 17 insertions(+) Index: linux-2.6/mm/page_alloc.c =================================================================== --- linux-2.6.orig/mm/page_alloc.c 2007-09-...

SLAB_VFALLBACK can be specified for selected slab caches. If fallback is available then the conservative settings for higher order allocations are overridden. We then request an order that can accomodate at mininum 100 objects. The size of an individual slab allocation is allowed to reach up to 256k (order 6 on i386, order 4 on IA64). Implementing fallback requires special handling of virtual mappings in the free path. However, the impact is minimal since we already check the address if its NULL or...

Sometimes we need to figure out which vmalloc address is in use for a certain page struct. There is no easy way to figure out the vmalloc address from the page struct. So simply search through the kernel page tables to find the address. This is a fairly expensive process. Use sparingly (or provide a better implementation). Signed-off-by: Christoph Lameter <clameter@sgi.com> --- include/linux/mm.h | 1 mm/vmalloc.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 ...

Make vunmap return the page array that was used at vmap. This is useful if one has no structures to track the page array but simply stores the virtual address somewhere. The disposition of the page array can be decided upon after vunmap. vfree() may now also be used instead of vunmap which will release the page array after vunmap'ping it. As noted by Kamezawa: The same subsystem that provides the page array to vmap must must use its own method to dispose of the page array. If vfree() is called to...

We already have page table manipulation for vmalloc in vmalloc.c. Move the vmalloc_to_page() function there as well. Move the definitions for vmalloc related functions in mm.h to before the functions dealing with compound pages because they will soon need to use them. Signed-off-by: Christoph Lameter <clameter@sgi.com> --- include/linux/mm.h | 5 +++-- mm/memory.c | 40 ---------------------------------------- mm/vmalloc.c | 38 ++++++++++++++++++++++++++++++++++++++...

Make vmalloc functions work the same way as kfree() and friends that take a const void * argument. Signed-off-by: Christoph Lameter <clameter@sgi.com> --- include/linux/mm.h | 4 ++-- include/linux/vmalloc.h | 6 +++--- mm/vmalloc.c | 16 ++++++++-------- 3 files changed, 13 insertions(+), 13 deletions(-) Index: linux-2.6/mm/vmalloc.c =================================================================== --- linux-2.6.orig/mm/vmalloc.c 2007-09-24 16:58:37.00000000...

[4/4] ext4: fix rec_len overflow - prevent rec_len from overflow with 64KB blocksize Signed-off-by: Takashi Sato <sho@tnes.nec.co.jp> Signed-off-by: Mingming Cao <cmm@us.ibm.com> --- fs/ext4/dir.c | 11 ++++-- fs/ext4/namei.c | 88 +++++++++++++++++++++++++++++++++++++++--------- include/linux/ext4_fs.h | 9 ++++ 3 files changed, 90 insertions(+), 18 deletions(-) Index: linux-2.6.23-rc8-mm1/fs/ext4/dir.c ==========================================...

Note that we just got a cleaner implemantation of this code on the ext4 mailing list from Jan Kara yesterday. Please use that one instead, in thread "Avoid rec_len overflow with 64KB block size" instead. Cheers, Andreas -- Andreas Dilger Principal Software Engineer Cluster File Systems, Inc. -

[This patch allows architectures that use 64k blocksizes--like IA64 and PPC64--to use 64k blocks on ext filesystems] The patches to support blocksizes up to PAGESIZE, max 64KB for ext2/3/4,\ were originally from Takashi Sato. http://marc.info/?l=linux-ext4&m=115768873518400&w=2 It's quite simple to support large block size in ext2/3/4, mostly just enlarge the block size limit. But it is NOT possible to have 64kB blocksize on ext2/3/4 without some changes to the directory handling code. ...