linux-next: manual merge of the vfs tree with the ext3 tree

linux-next: manual merge of the vfs tree with the ext3 tree

[broonie]

Hi all,

Today's linux-next merge of the vfs tree got a conflict in:

  fs/notify/fanotify/fanotify.h

between commit:

  7a80bf902d2bc ("fanotify: Remove obsoleted fanotify_event_has_path()")

from the ext3 tree and commit:

  d5bf88895f246 ("fs/notify: constify path")

from the vfs tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc fs/notify/fanotify/fanotify.h
index b34246c6ec87e,bf6d4d38afa04..0000000000000
--- a/fs/notify/fanotify/fanotify.h
+++ b/fs/notify/fanotify/fanotify.h
@@@ -452,7 -452,13 +452,7 @@@ static inline bool fanotify_is_error_ev
  	return mask & FAN_FS_ERROR;
  }
  
- static inline struct path *fanotify_event_path(struct fanotify_event *event)
 -static inline bool fanotify_event_has_path(struct fanotify_event *event)
 -{
 -	return event->type == FANOTIFY_EVENT_TYPE_PATH ||
 -		event->type == FANOTIFY_EVENT_TYPE_PATH_PERM;
 -}
 -
+ static inline const struct path *fanotify_event_path(struct fanotify_event *event)
  {
  	if (event->type == FANOTIFY_EVENT_TYPE_PATH)
  		return &FANOTIFY_PE(event)->path;

linux-next: manual merge of the vfs tree with the ext3 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1445 bytes --]

Hi all,

Today's linux-next merge of the vfs tree got a conflict in:

  fs/notify/fanotify/fanotify.h

between commit:

  7a80bf902d2b ("fanotify: Remove obsoleted fanotify_event_has_path()")

from the ext3 tree and commit:

  d5bf88895f24 ("fs/notify: constify path")

from the vfs tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/notify/fanotify/fanotify.h
index b34246c6ec87,bf6d4d38afa0..000000000000
--- a/fs/notify/fanotify/fanotify.h
+++ b/fs/notify/fanotify/fanotify.h
@@@ -452,7 -452,13 +452,7 @@@ static inline bool fanotify_is_error_ev
  	return mask & FAN_FS_ERROR;
  }
  
- static inline struct path *fanotify_event_path(struct fanotify_event *event)
 -static inline bool fanotify_event_has_path(struct fanotify_event *event)
 -{
 -	return event->type == FANOTIFY_EVENT_TYPE_PATH ||
 -		event->type == FANOTIFY_EVENT_TYPE_PATH_PERM;
 -}
 -
+ static inline const struct path *fanotify_event_path(struct fanotify_event *event)
  {
  	if (event->type == FANOTIFY_EVENT_TYPE_PATH)
  		return &FANOTIFY_PE(event)->path;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the vfs tree with the ext3 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1273 bytes --]

Hi Al,

Today's linux-next merge of the vfs tree got a conflict in:

  fs/Makefile

between commit:

  d44170a7ba48 ("fs: common implementation of file type")

from the ext3 tree and commits:

  fe43eec04841 ("vfs: Introduce fs_context, switch vfs_kern_mount() to it.")
  82685adaccb3 ("vfs: Add configuration parser helpers")

from the vfs tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/Makefile
index da0d43eb2bc5,9a0b8003f069..000000000000
--- a/fs/Makefile
+++ b/fs/Makefile
@@@ -13,7 -13,7 +13,7 @@@ obj-y :=	open.o read_write.o file_table
  		seq_file.o xattr.o libfs.o fs-writeback.o \
  		pnode.o splice.o sync.o utimes.o d_path.o \
  		stack.o fs_struct.o statfs.o fs_pin.o nsfs.o \
- 		fs_types.o
 -		fs_context.o fs_parser.o
++		fs_types.o fs_context.o fs_parser.o
  
  ifeq ($(CONFIG_BLOCK),y)
  obj-y +=	buffer.o block_dev.o direct-io.o mpage.o

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the vfs tree with the ext3 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1376 bytes --]

Hi Al,

Today's linux-next merge of the vfs tree got a conflict in:

  fs/Makefile

between commit:

  d44170a7ba48 ("fs: common implementation of file type")

from the ext3 tree and commits:

  229e55402816 ("vfs: Add configuration parser helpers")
  37744f3d21f8 ("vfs: Implement a filesystem superblock creation/configuration context")
  1d9c8fafbf6f ("vfs: syscall: Add fsopen() to prepare for superblock creation")

from the vfs tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/Makefile
index 23fcd8c164a3,e3ea8093b178..000000000000
--- a/fs/Makefile
+++ b/fs/Makefile
@@@ -13,7 -13,7 +13,8 @@@ obj-y :=	open.o read_write.o file_table
  		seq_file.o xattr.o libfs.o fs-writeback.o \
  		pnode.o splice.o sync.o utimes.o d_path.o \
  		stack.o fs_struct.o statfs.o fs_pin.o nsfs.o \
 -		fs_context.o fs_parser.o fsopen.o
++		fs_context.o fs_parser.o fsopen.o \
 +		fs_types.o
  
  ifeq ($(CONFIG_BLOCK),y)
  obj-y +=	buffer.o block_dev.o direct-io.o mpage.o

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the vfs tree with the ext3 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2099 bytes --]

Hi all,

On Fri, 1 Jun 2018 11:56:19 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the vfs tree got a conflict in:
> 
>   include/linux/fs.h
> 
> between commit:
> 
>   29aca8b3f7cd ("fsnotify: introduce prototype struct fsnotify_obj")
> 
> from the ext3 tree and commit:
> 
>   d9a08a9e616b ("fs: Add aio iopriority support")
> 
> from the vfs tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc include/linux/fs.h
> index d1f3d572349f,482563fe549c..000000000000
> --- a/include/linux/fs.h
> +++ b/include/linux/fs.h
> @@@ -36,7 -36,7 +36,8 @@@
>   #include <linux/delayed_call.h>
>   #include <linux/uuid.h>
>   #include <linux/errseq.h>
>  +#include <linux/fsnotify_obj.h>
> + #include <linux/ioprio.h>
>   
>   #include <asm/byteorder.h>
>   #include <uapi/linux/fs.h>
> @@@ -1717,9 -1713,10 +1719,11 @@@ struct file_operations 
>   	int (*iterate) (struct file *, struct dir_context *);
>   	int (*iterate_shared) (struct file *, struct dir_context *);
>   	__poll_t (*poll) (struct file *, struct poll_table_struct *);
> + 	struct wait_queue_head * (*get_poll_head)(struct file *, __poll_t);
> + 	__poll_t (*poll_mask) (struct file *, __poll_t);
>   	long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);
>   	long (*compat_ioctl) (struct file *, unsigned int, unsigned long);
>  +	int (*pre_mmap) (struct file *, unsigned long, unsigned long);
>   	int (*mmap) (struct file *, struct vm_area_struct *);
>   	unsigned long mmap_supported_flags;
>   	int (*open) (struct inode *, struct file *);

This is now a conflict between the ext3 tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the vfs tree with the ext3 tree

[Jan Kara]

Hi,

On Fri 01-06-18 11:56:19, Stephen Rothwell wrote:
> Today's linux-next merge of the vfs tree got a conflict in:
> 
>   include/linux/fs.h
> 
> between commit:
> 
>   29aca8b3f7cd ("fsnotify: introduce prototype struct fsnotify_obj")
> 
> from the ext3 tree and commit:
> 
>   d9a08a9e616b ("fs: Add aio iopriority support")
> 
> from the vfs tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Thanks, the resolution looks good to me.

								Honza

> diff --cc include/linux/fs.h
> index d1f3d572349f,482563fe549c..000000000000
> --- a/include/linux/fs.h
> +++ b/include/linux/fs.h
> @@@ -36,7 -36,7 +36,8 @@@
>   #include <linux/delayed_call.h>
>   #include <linux/uuid.h>
>   #include <linux/errseq.h>
>  +#include <linux/fsnotify_obj.h>
> + #include <linux/ioprio.h>
>   
>   #include <asm/byteorder.h>
>   #include <uapi/linux/fs.h>
> @@@ -1717,9 -1713,10 +1719,11 @@@ struct file_operations 
>   	int (*iterate) (struct file *, struct dir_context *);
>   	int (*iterate_shared) (struct file *, struct dir_context *);
>   	__poll_t (*poll) (struct file *, struct poll_table_struct *);
> + 	struct wait_queue_head * (*get_poll_head)(struct file *, __poll_t);
> + 	__poll_t (*poll_mask) (struct file *, __poll_t);
>   	long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);
>   	long (*compat_ioctl) (struct file *, unsigned int, unsigned long);
>  +	int (*pre_mmap) (struct file *, unsigned long, unsigned long);
>   	int (*mmap) (struct file *, struct vm_area_struct *);
>   	unsigned long mmap_supported_flags;
>   	int (*open) (struct inode *, struct file *);


-- 
Jan Kara <jack@suse.com>
SUSE Labs, CR

linux-next: manual merge of the vfs tree with the ext3 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1815 bytes --]

Hi all,

Today's linux-next merge of the vfs tree got a conflict in:

  include/linux/fs.h

between commit:

  29aca8b3f7cd ("fsnotify: introduce prototype struct fsnotify_obj")

from the ext3 tree and commit:

  d9a08a9e616b ("fs: Add aio iopriority support")

from the vfs tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc include/linux/fs.h
index d1f3d572349f,482563fe549c..000000000000
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@@ -36,7 -36,7 +36,8 @@@
  #include <linux/delayed_call.h>
  #include <linux/uuid.h>
  #include <linux/errseq.h>
 +#include <linux/fsnotify_obj.h>
+ #include <linux/ioprio.h>
  
  #include <asm/byteorder.h>
  #include <uapi/linux/fs.h>
@@@ -1717,9 -1713,10 +1719,11 @@@ struct file_operations 
  	int (*iterate) (struct file *, struct dir_context *);
  	int (*iterate_shared) (struct file *, struct dir_context *);
  	__poll_t (*poll) (struct file *, struct poll_table_struct *);
+ 	struct wait_queue_head * (*get_poll_head)(struct file *, __poll_t);
+ 	__poll_t (*poll_mask) (struct file *, __poll_t);
  	long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);
  	long (*compat_ioctl) (struct file *, unsigned int, unsigned long);
 +	int (*pre_mmap) (struct file *, unsigned long, unsigned long);
  	int (*mmap) (struct file *, struct vm_area_struct *);
  	unsigned long mmap_supported_flags;
  	int (*open) (struct inode *, struct file *);

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the vfs tree with the ext3 tree

[Stephen Rothwell]

Hi Al,

Today's linux-next merge of the vfs tree got a conflict in:

  fs/ext2/super.c

between commits:

  088519572ca8 ("ext2: Parse mount options into a dedicated structure")
  8af634ff9e5c ("ext2: Fix possible sleep in atomic during mount option parsing")

from the ext3 tree and commit:

  c2c6773f9942 ("VFS: Roll out mount flag differentiation (MS_* -> SB_*) generally")

from the vfs tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/ext2/super.c
index e2b6be03e69b,620dc029ca32..000000000000
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@@ -906,27 -905,23 +906,27 @@@ static int ext2_fill_super(struct super
  #endif
  	
  	if (le16_to_cpu(sbi->s_es->s_errors) == EXT2_ERRORS_PANIC)
 -		set_opt(sbi->s_mount_opt, ERRORS_PANIC);
 +		set_opt(opts.s_mount_opt, ERRORS_PANIC);
  	else if (le16_to_cpu(sbi->s_es->s_errors) == EXT2_ERRORS_CONTINUE)
 -		set_opt(sbi->s_mount_opt, ERRORS_CONT);
 +		set_opt(opts.s_mount_opt, ERRORS_CONT);
  	else
 -		set_opt(sbi->s_mount_opt, ERRORS_RO);
 +		set_opt(opts.s_mount_opt, ERRORS_RO);
  
 -	sbi->s_resuid = make_kuid(&init_user_ns, le16_to_cpu(es->s_def_resuid));
 -	sbi->s_resgid = make_kgid(&init_user_ns, le16_to_cpu(es->s_def_resgid));
 +	opts.s_resuid = make_kuid(&init_user_ns, le16_to_cpu(es->s_def_resuid));
 +	opts.s_resgid = make_kgid(&init_user_ns, le16_to_cpu(es->s_def_resgid));
  	
 -	set_opt(sbi->s_mount_opt, RESERVATION);
 +	set_opt(opts.s_mount_opt, RESERVATION);
  
 -	if (!parse_options((char *) data, sb))
 +	if (!parse_options((char *) data, sb, &opts))
  		goto failed_mount;
  
 +	sbi->s_mount_opt = opts.s_mount_opt;
 +	sbi->s_resuid = opts.s_resuid;
 +	sbi->s_resgid = opts.s_resgid;
 +
- 	sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
+ 	sb->s_flags = (sb->s_flags & ~SB_POSIXACL) |
  		((EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ?
- 		 MS_POSIXACL : 0);
+ 		 SB_POSIXACL : 0);
  	sb->s_iflags |= SB_I_CGROUPWB;
  
  	if (le32_to_cpu(es->s_rev_level) == EXT2_GOOD_OLD_REV &&
@@@ -1331,22 -1328,30 +1331,22 @@@ static int ext2_remount (struct super_b
  	/*
  	 * Allow the "check" option to be passed as a remount option.
  	 */
 -	if (!parse_options(data, sb)) {
 -		err = -EINVAL;
 -		goto restore_opts;
 -	}
 -
 -	sb->s_flags = (sb->s_flags & ~SB_POSIXACL) |
 -		((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? SB_POSIXACL : 0);
 +	if (!parse_options(data, sb, &new_opts))
 +		return -EINVAL;
  
 +	spin_lock(&sbi->s_lock);
  	es = sbi->s_es;
 -	if ((sbi->s_mount_opt ^ old_opts.s_mount_opt) & EXT2_MOUNT_DAX) {
 +	if ((sbi->s_mount_opt ^ new_opts.s_mount_opt) & EXT2_MOUNT_DAX) {
  		ext2_msg(sb, KERN_WARNING, "warning: refusing change of "
  			 "dax flag with busy inodes while remounting");
 -		sbi->s_mount_opt ^= EXT2_MOUNT_DAX;
 -	}
 -	if ((bool)(*flags & SB_RDONLY) == sb_rdonly(sb)) {
 -		spin_unlock(&sbi->s_lock);
 -		return 0;
 +		new_opts.s_mount_opt ^= EXT2_MOUNT_DAX;
  	}
- 	if ((bool)(*flags & MS_RDONLY) == sb_rdonly(sb))
++	if ((bool)(*flags & SB_RDONLY) == sb_rdonly(sb))
 +		goto out_set;
- 	if (*flags & MS_RDONLY) {
+ 	if (*flags & SB_RDONLY) {
  		if (le16_to_cpu(es->s_state) & EXT2_VALID_FS ||
 -		    !(sbi->s_mount_state & EXT2_VALID_FS)) {
 -			spin_unlock(&sbi->s_lock);
 -			return 0;
 -		}
 +		    !(sbi->s_mount_state & EXT2_VALID_FS))
 +			goto out_set;
  
  		/*
  		 * OK, we are remounting a valid rw partition rdonly, so set
@@@ -1387,16 -1394,14 +1387,16 @@@
  		dquot_resume(sb, -1);
  	}
  
 -	return 0;
 -restore_opts:
 -	sbi->s_mount_opt = old_opts.s_mount_opt;
 -	sbi->s_resuid = old_opts.s_resuid;
 -	sbi->s_resgid = old_opts.s_resgid;
 -	sb->s_flags = old_sb_flags;
 +	spin_lock(&sbi->s_lock);
 +out_set:
 +	sbi->s_mount_opt = new_opts.s_mount_opt;
 +	sbi->s_resuid = new_opts.s_resuid;
 +	sbi->s_resgid = new_opts.s_resgid;
- 	sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
- 		((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
++	sb->s_flags = (sb->s_flags & ~SB_POSIXACL) |
++		((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? SB_POSIXACL : 0);
  	spin_unlock(&sbi->s_lock);
 -	return err;
 +
 +	return 0;
  }
  
  static int ext2_statfs (struct dentry * dentry, struct kstatfs * buf)

linux-next: manual merge of the vfs tree with the ext3 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 793 bytes --]

Hi Al,

Today's linux-next merge of the vfs tree got a conflict in
fs/udf/file.c between commit 13f0c2b0f67d ("udf: remove redundant
buffer_head.h includes") from the ext3 tree and commit 52858684778b
("fs: move struct kiocb to fs.h") from the vfs tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc fs/udf/file.c
index dda8ea7012c6,7f885cc8b0b7..000000000000
--- a/fs/udf/file.c
+++ b/fs/udf/file.c
@@@ -33,7 -33,8 +33,7 @@@
  #include <linux/capability.h>
  #include <linux/errno.h>
  #include <linux/pagemap.h>
- #include <linux/aio.h>
 -#include <linux/buffer_head.h>
+ #include <linux/uio.h>
  
  #include "udf_i.h"
  #include "udf_sb.h"

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

linux-next: manual merge of the vfs tree with the ext3 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1114 bytes --]

Hi Al,

Today's linux-next merge of the vfs tree got a conflict in
include/linux/fs.h between commit 4789fd4495a4 ("quota: Fix deadlock with
suspend and quotas") from the ext3 tree and commit cf31e70d6cf9 ("vfs:
new helper - vfs_ustat()") from the vfs tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc include/linux/fs.h
index 3aba12c,7aacf31..0000000
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@@ -2531,8 -2489,6 +2489,7 @@@ extern void put_filesystem(struct file_
  extern struct file_system_type *get_fs_type(const char *name);
  extern struct super_block *get_super(struct block_device *);
  extern struct super_block *get_active_super(struct block_device *bdev);
- extern struct super_block *user_get_super(dev_t);
 +extern void put_super(struct super_block *sb);
  extern void drop_super(struct super_block *sb);
  extern void iterate_supers(void (*)(struct super_block *, void *), void *);
  extern void iterate_supers_type(struct file_system_type *,

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the vfs tree with the ext3 tree

[Jan Kara]

  Hi,

On Mon 18-07-11 13:36:45, Stephen Rothwell wrote:
> Today's linux-next merge of the vfs tree got a conflict in
> fs/ext3/fsync.c between commit 785c4bcc0d88 ("ext3: Add fixed
> tracepoints") from the ext3 tree and commit 62ec115d5b9c ("fs: push
> i_mutex and filemap_write_and_wait down into ->fsync() handlers") from
> the vfs tree.
> 
> I fixed it up (see below) but am not sure of the ordering of these two
> separate changes.
  Thanks. Logically, I'd expect trace_ext3_sync_file_enter() to be always
called at the beginning of ext3_sync_file(). That means before
filemap_write_and_wait_range()... I guess the easiest way to resolve this
is if Al pulls the tracepoint patch from my tree to his - it's commit
785c4bcc0d88ff006a0b2120815a71e86ecf21ce in
git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6

								Honza

> diff --cc fs/ext3/fsync.c
> index 06a4394,0bcf63a..0000000
> --- a/fs/ext3/fsync.c
> +++ b/fs/ext3/fsync.c
> @@@ -52,14 -51,22 +52,24 @@@ int ext3_sync_file(struct file *file, l
>   	int ret, needs_barrier = 0;
>   	tid_t commit_tid;
>   
>  -	if (inode->i_sb->s_flags & MS_RDONLY)
>  -		return 0;
>  -
> + 	ret = filemap_write_and_wait_range(inode->i_mapping, start, end);
> + 	if (ret)
> + 		return ret;
> + 
> + 	/*
> + 	 * Taking the mutex here just to keep consistent with how fsync was
> + 	 * called previously, however it looks like we don't need to take
> + 	 * i_mutex at all.
> + 	 */
> + 	mutex_lock(&inode->i_mutex);
> + 
>   	J_ASSERT(ext3_journal_current_handle() == NULL);
>   
>  +	trace_ext3_sync_file_enter(file, datasync);
>  +
>  +	if (inode->i_sb->s_flags & MS_RDONLY)
>  +		return 0;
>  +
> - 
>   	/*
>   	 * data=writeback,ordered:
>   	 *  The caller's filemap_fdatawrite()/wait will sync the data.
> @@@ -75,8 -82,8 +85,9 @@@
>   	 *  safe in-journal, which is all fsync() needs to ensure.
>   	 */
>   	if (ext3_should_journal_data(inode)) {
> + 		mutex_unlock(&inode->i_mutex);
>  -		return ext3_force_commit(inode->i_sb);
>  +		ret = ext3_force_commit(inode->i_sb);
>  +		goto out;
>   	}
>   
>   	if (datasync)
> @@@ -97,8 -104,6 +108,9 @@@
>   	 */
>   	if (needs_barrier)
>   		blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL, NULL);
> + 	mutex_unlock(&inode->i_mutex);
>  +
>  +out:
>  +	trace_ext3_sync_file_exit(inode, ret);
>   	return ret;
>   }
-- 
Jan Kara <jack@suse.cz>
SUSE Labs, CR

linux-next: manual merge of the vfs tree with the ext3 tree

[Stephen Rothwell]

Hi Al,

Today's linux-next merge of the vfs tree got a conflict in
fs/ext3/fsync.c between commit 785c4bcc0d88 ("ext3: Add fixed
tracepoints") from the ext3 tree and commit 62ec115d5b9c ("fs: push
i_mutex and filemap_write_and_wait down into ->fsync() handlers") from
the vfs tree.

I fixed it up (see below) but am not sure of the ordering of these two
separate changes.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc fs/ext3/fsync.c
index 06a4394,0bcf63a..0000000
--- a/fs/ext3/fsync.c
+++ b/fs/ext3/fsync.c
@@@ -52,14 -51,22 +52,24 @@@ int ext3_sync_file(struct file *file, l
  	int ret, needs_barrier = 0;
  	tid_t commit_tid;
  
 -	if (inode->i_sb->s_flags & MS_RDONLY)
 -		return 0;
 -
+ 	ret = filemap_write_and_wait_range(inode->i_mapping, start, end);
+ 	if (ret)
+ 		return ret;
+ 
+ 	/*
+ 	 * Taking the mutex here just to keep consistent with how fsync was
+ 	 * called previously, however it looks like we don't need to take
+ 	 * i_mutex at all.
+ 	 */
+ 	mutex_lock(&inode->i_mutex);
+ 
  	J_ASSERT(ext3_journal_current_handle() == NULL);
  
 +	trace_ext3_sync_file_enter(file, datasync);
 +
 +	if (inode->i_sb->s_flags & MS_RDONLY)
 +		return 0;
 +
- 
  	/*
  	 * data=writeback,ordered:
  	 *  The caller's filemap_fdatawrite()/wait will sync the data.
@@@ -75,8 -82,8 +85,9 @@@
  	 *  safe in-journal, which is all fsync() needs to ensure.
  	 */
  	if (ext3_should_journal_data(inode)) {
+ 		mutex_unlock(&inode->i_mutex);
 -		return ext3_force_commit(inode->i_sb);
 +		ret = ext3_force_commit(inode->i_sb);
 +		goto out;
  	}
  
  	if (datasync)
@@@ -97,8 -104,6 +108,9 @@@
  	 */
  	if (needs_barrier)
  		blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL, NULL);
+ 	mutex_unlock(&inode->i_mutex);
 +
 +out:
 +	trace_ext3_sync_file_exit(inode, ret);
  	return ret;
  }

linux-next: manual merge of the vfs tree with the ext3 tree

[Stephen Rothwell]

Hi Al,

Today's linux-next merge of the vfs tree got a conflict in fs/ufs/file.c
between commit 8f45c33decf62e1aaaa9411aae8fef6a38f95845 ("ufs: Remove
dead quota code") from the ext3 tree and commit
8f1edffdb5a76f205cf45070e1552ee8b2239a2b ("rename the generic fsync
implementations") from the vfs tree.

Just context changes.  I fixed it up (see below) and can carry the fix
for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc fs/ufs/file.c
index 73655c6,d4c30d1..0000000
--- a/fs/ufs/file.c
+++ b/fs/ufs/file.c
@@@ -40,7 -41,7 +40,7 @@@ const struct file_operations ufs_file_o
  	.write		= do_sync_write,
  	.aio_write	= generic_file_aio_write,
  	.mmap		= generic_file_mmap,
 -	.open           = dquot_file_open,
 +	.open           = generic_file_open,
- 	.fsync		= simple_fsync,
+ 	.fsync		= generic_file_fsync,
  	.splice_read	= generic_file_splice_read,
  };