From ad3dcfae20e0e29c411b07d44938f5f3c73cdde7 Mon Sep 17 00:00:00 2001
From: Lukas Czerner <lczerner@redhat.com>
Date: Tue, 16 Oct 2012 11:39:07 +0200
Subject: [PATCH] --- yaml --- r: 335446 b: refs/heads/master c:
 3a238adefb8c5b8cb8cde0ce689d513306176ff4 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/fs/gfs2/rgrp.c | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 95ac8c958db9..4182f6a7f984 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 73738a77f42c2d7f53fd61f73272c9dd6f520897
+refs/heads/master: 3a238adefb8c5b8cb8cde0ce689d513306176ff4
diff --git a/trunk/fs/gfs2/rgrp.c b/trunk/fs/gfs2/rgrp.c
index 43d1a20bdbe4..b6bbf718d6c3 100644
--- a/trunk/fs/gfs2/rgrp.c
+++ b/trunk/fs/gfs2/rgrp.c
@@ -1270,11 +1270,7 @@ int gfs2_fitrim(struct file *filp, void __user *argp)
 	if (!blk_queue_discard(q))
 		return -EOPNOTSUPP;
 
-	if (argp == NULL) {
-		r.start = 0;
-		r.len = ULLONG_MAX;
-		r.minlen = 0;
-	} else if (copy_from_user(&r, argp, sizeof(r)))
+	if (copy_from_user(&r, argp, sizeof(r)))
 		return -EFAULT;
 
 	ret = gfs2_rindex_update(sdp);
@@ -1323,7 +1319,7 @@ int gfs2_fitrim(struct file *filp, void __user *argp)
 
 out:
 	r.len = trimmed << 9;
-	if (argp && copy_to_user(argp, &r, sizeof(r)))
+	if (copy_to_user(argp, &r, sizeof(r)))
 		return -EFAULT;
 
 	return ret;