[Devel] [PATCH RHEL7 COMMIT] fs/ioprio: move IOPRIO_WHO_UBC handling out of rcu section

[Konstantin Khorenko]

The commit is pushed to "branch-rh7-3.10.0-123.1.2-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-123.1.2.vz7.5.13
------>
commit dde5edb763032121c3d3e5ab4fd4d9b69ad8a4fd
Author: Vladimir Davydov <vdavydov at parallels.com>
Date:   Tue Jun 16 16:28:14 2015 +0400

    fs/ioprio: move IOPRIO_WHO_UBC handling out of rcu section
    
    Patchset description:
    
    https://jira.sw.ru/browse/PSBM-34007
    
    Vladimir Davydov (7):
      ioprio: move IOPRIO_WHO_UBC handling out of rcu section
      ub: zap ub_{init,fini}_ioprio
      ub: export ub_get_{mem,blkio}_css
      ub: ressurrect ioprio_set IOPRIO_WHO_UBC
      ub: ressurrect iostat and ioprio reporting
      ub: account writeback io
      ub: do not include block/blk-cgroup.h from io_prio.c
    
    This patch description:
    
    There is no point in having it there, and I need to sleep in
    ub_set_ioprio.
    
    Signed-off-by: Vladimir Davydov <vdavydov at parallels.com>
    Acked-by: Dmitry Monakhov <dmonakhov at openvz.org>
---
 fs/ioprio.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/fs/ioprio.c b/fs/ioprio.c
index 277c73f..b54e34e 100644
--- a/fs/ioprio.c
+++ b/fs/ioprio.c
@@ -108,6 +108,12 @@ SYSCALL_DEFINE3(ioprio_set, int, which, int, who, int, ioprio)
 			return -EINVAL;
 	}
 
+	if (which == IOPRIO_WHO_UBC) {
+		if (class != IOPRIO_CLASS_BE)
+			return -ERANGE;
+		return ub_set_ioprio(who, data);
+	}
+
 	ret = -ESRCH;
 	rcu_read_lock();
 	switch (which) {
@@ -153,14 +159,6 @@ free_uid:
 			if (who)
 				free_uid(user);
 			break;
-		case IOPRIO_WHO_UBC:
-			if (class != IOPRIO_CLASS_BE) {
-				ret = -ERANGE;
-				break;
-			}
-
-			ret = ub_set_ioprio(who, data);
-			break;
 		default:
 			ret = -EINVAL;
 	}