From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 3 Oct 2012 15:48:21 +0000 (-0700)
Subject: Merge tag 'jfs-3.7' of git://github.com/kleikamp/linux-shaggy
X-Git-Tag: v3.7-rc1~124
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eb0ad9c06d51edb5d18a7007fd4d77a8805b2ba7;p=platform%2Fkernel%2Flinux-3.10.git

Merge tag 'jfs-3.7' of git://github.com/kleikamp/linux-shaggy

Pull JFS update from Dave Kleikamp:
 "JFS TRIM support and some minor fixes"

* tag 'jfs-3.7' of git://github.com/kleikamp/linux-shaggy:
  jfs: Fix do_div precision in commit b40c2e66
  JFS: use list_move instead of list_del/list_add
  jfs: Remove obsolete email address
  fs/jfs: TRIM support for JFS Filesystem
---

eb0ad9c06d51edb5d18a7007fd4d77a8805b2ba7
diff --cc fs/jfs/jfs_incore.h
index 680605d,4fa958a..cf47f09
--- a/fs/jfs/jfs_incore.h
+++ b/fs/jfs/jfs_incore.h
@@@ -192,9 -192,10 +192,10 @@@ struct jfs_sb_info 
  	uint		state;		/* mount/recovery state	*/
  	unsigned long	flag;		/* mount time flags */
  	uint		p_state;	/* state prior to going no integrity */
 -	uint		uid;		/* uid to override on-disk uid */
 -	uint		gid;		/* gid to override on-disk gid */
 +	kuid_t		uid;		/* uid to override on-disk uid */
 +	kgid_t		gid;		/* gid to override on-disk gid */
  	uint		umask;		/* umask to override on-disk umask */
+ 	uint		minblks_trim;	/* minimum blocks, for online trim */
  };
  
  /* jfs_sb_info commit_state */
diff --cc fs/jfs/super.c
index efdf883,6f4ac1c..1a543be
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
@@@ -321,21 -322,17 +322,23 @@@ static int parse_options(char *options
  		case Opt_uid:
  		{
  			char *uid = args[0].from;
 -			sbi->uid = simple_strtoul(uid, &uid, 0);
 +			uid_t val = simple_strtoul(uid, &uid, 0);
 +			sbi->uid = make_kuid(current_user_ns(), val);
 +			if (!uid_valid(sbi->uid))
 +				goto cleanup;
  			break;
  		}
+ 
  		case Opt_gid:
  		{
  			char *gid = args[0].from;
 -			sbi->gid = simple_strtoul(gid, &gid, 0);
 +			gid_t val = simple_strtoul(gid, &gid, 0);
 +			sbi->gid = make_kgid(current_user_ns(), val);
 +			if (!gid_valid(sbi->gid))
 +				goto cleanup;
  			break;
  		}
+ 
  		case Opt_umask:
  		{
  			char *umask = args[0].from;