Re: linux-next: Tree for July 20 (overlayfs)

From: Sedat Dilek
Date: Fri Jul 22 2011 - 07:39:08 EST


On Fri, Jul 22, 2011 at 11:51 AM, Miklos Szeredi <miklos@xxxxxxxxxx> wrote:
[ ... ]
> And ->fsync is another one that will have an updated API.
>
> Miklos
>
> ---
> Âfs/overlayfs/readdir.c | Â Â5 +++--
> Â1 file changed, 3 insertions(+), 2 deletions(-)
>
> Index: linux-2.6/fs/overlayfs/readdir.c
> ===================================================================
> --- linux-2.6.orig/fs/overlayfs/readdir.c    2011-07-21 17:07:52.000000000 +0200
> +++ linux-2.6/fs/overlayfs/readdir.c  Â2011-07-21 17:10:20.000000000 +0200
> @@ -386,7 +386,8 @@ static loff_t ovl_dir_llseek(struct file
> Â Â Â Âreturn res;
> Â}
>
> -static int ovl_dir_fsync(struct file *file, int datasync)
> +static int ovl_dir_fsync(struct file *file, loff_t start, loff_t end,
> + Â Â Â Â Â Â Â Â Â Â Â Âint datasync)
> Â{
> Â Â Â Âstruct ovl_dir_file *od = file->private_data;
>
> @@ -400,7 +401,7 @@ static int ovl_dir_fsync(struct file *fi
> Â Â Â Â Â Â Â Â Â Â Â Âreturn PTR_ERR(od->realfile);
> Â Â Â Â}
>
> - Â Â Â return vfs_fsync(od->realfile, datasync);
> + Â Â Â return vfs_fsync_range(od->realfile, start, end, datasync);
> Â}
>
> Âstatic int ovl_dir_release(struct inode *inode, struct file *file)
>

OK, I see your patch is like mine due to changes in linux-next (here:
I checked with next-20110721):

commit cbc4facd43b3502f644d7f01a9a48f8bec5f3e57
"fs: push i_mutex and filemap_write_and_wait down into ->fsync() handlers"

Is it possible to have a clean...

1. OverlayFS v11 against Linux-3.0
2. OverlayFS v11 against vfs-2.6.git#for-next (see [2])

- Sedat -

[1] <http://git.us.kernel.org/?p=linux/kernel/git/viro/vfs-2.6.git;a=commit;h=cbc4facd43b3502f644d7f01a9a48f8bec5f3e57>
[2] <http://git.us.kernel.org/?p=linux/kernel/git/viro/vfs-2.6.git;a=shortlog;h=refs/heads/for-next>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/