From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 8 Feb 2014 21:38:28 +0000 (-0800)
Subject: Merge branch 'staging-linus' into staging-work
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=7ca363f6872bede71e486352885de3a88f4a3967;p=deliverable%2Flinux.git

Merge branch 'staging-linus' into staging-work

This is to pull in the lustre fixes so that others can continue to work
on updating the lustre codebase, as well as resolve some merge issues
with the ion and ocproto drivers to keep linux-next happy.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

7ca363f6872bede71e486352885de3a88f4a3967
diff --cc drivers/staging/android/ion/ion_dummy_driver.c
index b89004af05ff,01cdc8aee898..3a45e79fe444
--- a/drivers/staging/android/ion/ion_dummy_driver.c
+++ b/drivers/staging/android/ion/ion_dummy_driver.c
@@@ -56,8 -58,8 +58,8 @@@ static struct ion_platform_heap dummy_h
  		},
  };
  
 -struct ion_platform_data dummy_ion_pdata = {
 +static struct ion_platform_data dummy_ion_pdata = {
- 	.nr = 4,
+ 	.nr = ARRAY_SIZE(dummy_heaps),
  	.heaps = dummy_heaps,
  };
  
diff --cc drivers/staging/android/ion/ion_heap.c
index 03cc43222b50,37e64d51394c..305b75ed6385
--- a/drivers/staging/android/ion/ion_heap.c
+++ b/drivers/staging/android/ion/ion_heap.c
@@@ -246,9 -246,9 +246,9 @@@ int ion_heap_init_deferred_free(struct 
  	if (IS_ERR(heap->task)) {
  		pr_err("%s: creating thread for deferred free failed\n",
  		       __func__);
 -		return PTR_RET(heap->task);
 +		return PTR_ERR_OR_ZERO(heap->task);
  	}
+ 	sched_setscheduler(heap->task, SCHED_IDLE, &param);
  	return 0;
  }
  
diff --cc drivers/staging/lustre/lustre/llite/dir.c
index a6860e895d04,52b7731bcc38..78ee3b118787
--- a/drivers/staging/lustre/lustre/llite/dir.c
+++ b/drivers/staging/lustre/lustre/llite/dir.c
@@@ -1091,10 -1086,10 +1091,10 @@@ static int quotactl_ioctl(struct ll_sb_
  		break;
  	case Q_GETQUOTA:
  		if (((type == USRQUOTA &&
- 		      uid_eq(current_euid(), make_kuid(&init_user_ns, id))) ||
+ 		      !uid_eq(current_euid(), make_kuid(&init_user_ns, id))) ||
  		     (type == GRPQUOTA &&
  		      !in_egroup_p(make_kgid(&init_user_ns, id)))) &&
 -		    (!cfs_capable(CFS_CAP_SYS_ADMIN) ||
 +		    (!capable(CFS_CAP_SYS_ADMIN) ||
  		     sbi->ll_flags & LL_SBI_RMT_CLIENT))
  			return -EPERM;
  		break;