From ac46d38b1fbd04e7bcee6fd076227a1d67115c15 Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Fri, 4 May 2012 11:34:03 +0000
Subject: [PATCH] --- yaml --- r: 300207 b: refs/heads/master c:
 38bf1953987c1735f3c9140fca762949a8cae507 h: refs/heads/master i:   300205:
 c94d19376ba3c80c6c3b436f2937cb871f6998fe   300203:
 564fd6624419321874ffaa7344e70dec2636245a   300199:
 e452a7aebad2517fd94477d055580fe25796d0d4   300191:
 8bbc878337a369edd1a45e98cbeb940dead6b214 v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/block/drbd/drbd_nl.c           | 2 +-
 trunk/drivers/md/dm-log-userspace-transfer.c | 2 +-
 trunk/drivers/video/uvesafb.c                | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 7d455cc1b913..f22835527627 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0268868ba064980488fc8c194db3d8e9fb2959c
+refs/heads/master: 38bf1953987c1735f3c9140fca762949a8cae507
diff --git a/trunk/drivers/block/drbd/drbd_nl.c b/trunk/drivers/block/drbd/drbd_nl.c
index abfaacaaf346..946166e13953 100644
--- a/trunk/drivers/block/drbd/drbd_nl.c
+++ b/trunk/drivers/block/drbd/drbd_nl.c
@@ -2297,7 +2297,7 @@ static void drbd_connector_callback(struct cn_msg *req, struct netlink_skb_parms
 		return;
 	}
 
-	if (!cap_raised(current_cap(), CAP_SYS_ADMIN)) {
+	if (!capable(CAP_SYS_ADMIN)) {
 		retcode = ERR_PERM;
 		goto fail;
 	}
diff --git a/trunk/drivers/md/dm-log-userspace-transfer.c b/trunk/drivers/md/dm-log-userspace-transfer.c
index 1f23e048f077..08d9a207259a 100644
--- a/trunk/drivers/md/dm-log-userspace-transfer.c
+++ b/trunk/drivers/md/dm-log-userspace-transfer.c
@@ -134,7 +134,7 @@ static void cn_ulog_callback(struct cn_msg *msg, struct netlink_skb_parms *nsp)
 {
 	struct dm_ulog_request *tfr = (struct dm_ulog_request *)(msg + 1);
 
-	if (!cap_raised(current_cap(), CAP_SYS_ADMIN))
+	if (!capable(CAP_SYS_ADMIN))
 		return;
 
 	spin_lock(&receiving_list_lock);
diff --git a/trunk/drivers/video/uvesafb.c b/trunk/drivers/video/uvesafb.c
index 26e83d7fdd6f..b0e2a4261afe 100644
--- a/trunk/drivers/video/uvesafb.c
+++ b/trunk/drivers/video/uvesafb.c
@@ -73,7 +73,7 @@ static void uvesafb_cn_callback(struct cn_msg *msg, struct netlink_skb_parms *ns
 	struct uvesafb_task *utask;
 	struct uvesafb_ktask *task;
 
-	if (!cap_raised(current_cap(), CAP_SYS_ADMIN))
+	if (!capable(CAP_SYS_ADMIN))
 		return;
 
 	if (msg->seq >= UVESAFB_TASKS_MAX)