linux-next: manual merge of the ext3 tree with Linus' tree

linux-next: manual merge of the ext3 tree with Linus' tree

[Stephen Rothwell]

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

Hi all,

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

  include/uapi/asm-generic/unistd.h

between commit:

  8b1462b67f23 ("quota: finish disable quotactl_path syscall")

from Linus' tree and commit:

  64c2c2c62f92 ("quota: Change quotactl_path() systcall to an fd-based one")

from the ext3 tree.

I fixed it up (I just used the latter version) 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

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

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

[Jan Kara]

  Hi Stephen,

On Tue 10-01-12 12:22:15, Stephen Rothwell wrote:
> Today's linux-next merge of the ext3 tree got a conflict in
> fs/ext2/ioctl.c between commit 2a79f17e4a64 ("vfs: mnt_drop_write_file
> ()") from Linus' tree and commit 6e85201ff4f4 ("ext2: protect inode
> changes in the SETVERSION and SETFLAGS ioctls") from the ext3 tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.
  Thanks. I now rebased my for_next branch on top of Linus's tree and
resolved the conflict so things should be OK from tomorrow.

							Honza

> diff --cc fs/ext2/ioctl.c
> index 1089f76,b7f931f..0000000
> --- a/fs/ext2/ioctl.c
> +++ b/fs/ext2/ioctl.c
> @@@ -80,28 -80,38 +80,38 @@@ long ext2_ioctl(struct file *filp, unsi
>   
>   		ext2_set_inode_flags(inode);
>   		inode->i_ctime = CURRENT_TIME_SEC;
> + 		mutex_unlock(&inode->i_mutex);
> + 
>   		mark_inode_dirty(inode);
>   setflags_out:
>  -		mnt_drop_write(filp->f_path.mnt);
>  +		mnt_drop_write_file(filp);
>   		return ret;
>   	}
>   	case EXT2_IOC_GETVERSION:
>   		return put_user(inode->i_generation, (int __user *) arg);
> - 	case EXT2_IOC_SETVERSION:
> + 	case EXT2_IOC_SETVERSION: {
> + 		__u32 generation;
> + 
>   		if (!inode_owner_or_capable(inode))
>   			return -EPERM;
>  -		ret = mnt_want_write(filp->f_path.mnt);
>  +		ret = mnt_want_write_file(filp);
>   		if (ret)
>   			return ret;
> - 		if (get_user(inode->i_generation, (int __user *) arg)) {
> + 		if (get_user(generation, (int __user *) arg)) {
>   			ret = -EFAULT;
> - 		} else {
> - 			inode->i_ctime = CURRENT_TIME_SEC;
> - 			mark_inode_dirty(inode);
> + 			goto setversion_out;
>   		}
> + 
> + 		mutex_lock(&inode->i_mutex);
> + 		inode->i_ctime = CURRENT_TIME_SEC;
> + 		inode->i_generation = generation;
> + 		mutex_unlock(&inode->i_mutex);
> + 
> + 		mark_inode_dirty(inode);
> + setversion_out:
>  -		mnt_drop_write(filp->f_path.mnt);
>  +		mnt_drop_write_file(filp);
>   		return ret;
> + 	}
>   	case EXT2_IOC_GETRSVSZ:
>   		if (test_opt(inode->i_sb, RESERVATION)
>   			&& S_ISREG(inode->i_mode)


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

linux-next: manual merge of the ext3 tree with Linus' tree

[Stephen Rothwell]

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

Hi Jan,

Today's linux-next merge of the ext3 tree got a conflict in
fs/ext2/ioctl.c between commit 2a79f17e4a64 ("vfs: mnt_drop_write_file
()") from Linus' tree and commit 6e85201ff4f4 ("ext2: protect inode
changes in the SETVERSION and SETFLAGS ioctls") from the ext3 tree.

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

diff --cc fs/ext2/ioctl.c
index 1089f76,b7f931f..0000000
--- a/fs/ext2/ioctl.c
+++ b/fs/ext2/ioctl.c
@@@ -80,28 -80,38 +80,38 @@@ long ext2_ioctl(struct file *filp, unsi
  
  		ext2_set_inode_flags(inode);
  		inode->i_ctime = CURRENT_TIME_SEC;
+ 		mutex_unlock(&inode->i_mutex);
+ 
  		mark_inode_dirty(inode);
  setflags_out:
 -		mnt_drop_write(filp->f_path.mnt);
 +		mnt_drop_write_file(filp);
  		return ret;
  	}
  	case EXT2_IOC_GETVERSION:
  		return put_user(inode->i_generation, (int __user *) arg);
- 	case EXT2_IOC_SETVERSION:
+ 	case EXT2_IOC_SETVERSION: {
+ 		__u32 generation;
+ 
  		if (!inode_owner_or_capable(inode))
  			return -EPERM;
 -		ret = mnt_want_write(filp->f_path.mnt);
 +		ret = mnt_want_write_file(filp);
  		if (ret)
  			return ret;
- 		if (get_user(inode->i_generation, (int __user *) arg)) {
+ 		if (get_user(generation, (int __user *) arg)) {
  			ret = -EFAULT;
- 		} else {
- 			inode->i_ctime = CURRENT_TIME_SEC;
- 			mark_inode_dirty(inode);
+ 			goto setversion_out;
  		}
+ 
+ 		mutex_lock(&inode->i_mutex);
+ 		inode->i_ctime = CURRENT_TIME_SEC;
+ 		inode->i_generation = generation;
+ 		mutex_unlock(&inode->i_mutex);
+ 
+ 		mark_inode_dirty(inode);
+ setversion_out:
 -		mnt_drop_write(filp->f_path.mnt);
 +		mnt_drop_write_file(filp);
  		return ret;
+ 	}
  	case EXT2_IOC_GETRSVSZ:
  		if (test_opt(inode->i_sb, RESERVATION)
  			&& S_ISREG(inode->i_mode)

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

linux-next: manual merge of the ext3 tree with Linus' tree

[Stephen Rothwell]

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

Hi Jan,

Today's linux-next merge of the ext3 tree got a conflict in
fs/udf/udfdecl.h between commit b9075fa968a0 ("treewide: use __printf not
__attribute__((format(printf,...)))") from Linus' tree and commit
7e273e3b41e3 ("udf: Promote some debugging messages to udf_error") from
the ext3 tree.

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

diff --cc fs/udf/udfdecl.h
index dc8a8dc,79aae3f..0000000
--- a/fs/udf/udfdecl.h
+++ b/fs/udf/udfdecl.h
@@@ -16,6 -18,21 +18,21 @@@
  #define UDF_PREALLOCATE
  #define UDF_DEFAULT_PREALLOC_BLOCKS	8
  
 -__attribute__((format(printf, 3, 4)))
 -extern void _udf_err(struct super_block *sb, const char *function,
 -		     const char *fmt, ...);
++extern __printf(3, 4) void _udf_err(struct super_block *sb,
++				     const char *function,
++				     const char *fmt, ...);
+ #define udf_err(sb, fmt, ...)					\
+ 	_udf_err(sb, __func__, fmt, ##__VA_ARGS__)
+ 
 -__attribute__((format(printf, 3, 4)))
 -extern void _udf_warn(struct super_block *sb, const char *function,
 -		      const char *fmt, ...);
++extern __printf(3, 4) void _udf_warn(struct super_block *sb,
++				      const char *function,
++				      const char *fmt, ...);
+ #define udf_warn(sb, fmt, ...)					\
+ 	_udf_warn(sb, __func__, fmt, ##__VA_ARGS__)
+ 
+ #define udf_info(fmt, ...)					\
+ 	pr_info("INFO " fmt, ##__VA_ARGS__)
+ 
  #undef UDFFS_DEBUG
  
  #ifdef UDFFS_DEBUG

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

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

[Jan Kara]

  Hi Stephen,

On Sat 22-05-10 15:45:32, Stephen Rothwell wrote:
> Today's linux-next merge of the ext3 tree got a conflict in fs/super.c
> between commits b20bd1a5e78af267dc4b6e1ffed48d5d776302c5 ("get rid of
> S_BIAS"), 1712ac8fda7d8bc4dc921f5777b7423aacad7263 ("Saner locking around
> deactivate_super()") and e1e46bf1866317d4f86f66bf18d3f07317d9f9ee ("Trim
> includes in fs/super.c") from Linus' tree and commits
> c3134141c78d5ea233a08b703b553e70cfb5c585 ("quota: move unmount handling
> into the filesystem") and cdb89ca659f5a39edf88f3c55e545ea3347533d1
> ("quota: explicitly set ->dq_op and ->s_qcop") from the ext3 tree.
  Thanks! I've now rebased for_next branch on recent Linus's tree and
so this conflict should go away.

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

linux-next: manual merge of the ext3 tree with Linus' tree

[Stephen Rothwell]

Hi Jan,

Today's linux-next merge of the ext3 tree got a conflict in fs/super.c
between commits b20bd1a5e78af267dc4b6e1ffed48d5d776302c5 ("get rid of
S_BIAS"), 1712ac8fda7d8bc4dc921f5777b7423aacad7263 ("Saner locking around
deactivate_super()") and e1e46bf1866317d4f86f66bf18d3f07317d9f9ee ("Trim
includes in fs/super.c") from Linus' tree and commits
c3134141c78d5ea233a08b703b553e70cfb5c585 ("quota: move unmount handling
into the filesystem") and cdb89ca659f5a39edf88f3c55e545ea3347533d1
("quota: explicitly set ->dq_op and ->s_qcop") from the ext3 tree.

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

diff --cc fs/super.c
index 69688b1,2e0811f..0000000
--- a/fs/super.c
+++ b/fs/super.c
@@@ -22,15 -22,22 +22,14 @@@
  
  #include <linux/module.h>
  #include <linux/slab.h>
 -#include <linux/init.h>
 -#include <linux/smp_lock.h>
  #include <linux/acct.h>
  #include <linux/blkdev.h>
- #include <linux/quotaops.h>
 -#include <linux/namei.h>
  #include <linux/mount.h>
  #include <linux/security.h>
 -#include <linux/syscalls.h>
 -#include <linux/vfs.h>
  #include <linux/writeback.h>		/* for the emergency remount stuff */
  #include <linux/idr.h>
 -#include <linux/kobject.h>
  #include <linux/mutex.h>
 -#include <linux/file.h>
  #include <linux/backing-dev.h>
 -#include <asm/uaccess.h>
  #include "internal.h"
  
  
@@@ -146,21 -175,21 +143,20 @@@ void put_super(struct super_block *sb
  
  
  /**
 - *	deactivate_super	-	drop an active reference to superblock
 + *	deactivate_locked_super	-	drop an active reference to superblock
   *	@s: superblock to deactivate
   *
 - *	Drops an active reference to superblock, acquiring a temprory one if
 - *	there is no active references left.  In that case we lock superblock,
 + *	Drops an active reference to superblock, converting it into a temprory
 + *	one if there is no other active references left.  In that case we
   *	tell fs driver to shut it down and drop the temporary reference we
   *	had just acquired.
 + *
 + *	Caller holds exclusive lock on superblock; that lock is released.
   */
 -void deactivate_super(struct super_block *s)
 +void deactivate_locked_super(struct super_block *s)
  {
  	struct file_system_type *fs = s->s_type;
 -	if (atomic_dec_and_lock(&s->s_active, &sb_lock)) {
 -		s->s_count -= S_BIAS-1;
 -		spin_unlock(&sb_lock);
 -		down_write(&s->s_umount);
 +	if (atomic_dec_and_test(&s->s_active)) {
- 		vfs_dq_off(s, 0);
  		fs->kill_sb(s);
  		put_filesystem(fs);
  		put_super(s);