From patchwork Sun Jul 20 18:23:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Perches X-Patchwork-Id: 4592011 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1592E9F26C for ; Sun, 20 Jul 2014 18:24:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2E1AD200D6 for ; Sun, 20 Jul 2014 18:24:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1E6DF2010B for ; Sun, 20 Jul 2014 18:24:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753851AbaGTSYj (ORCPT ); Sun, 20 Jul 2014 14:24:39 -0400 Received: from smtprelay0078.hostedemail.com ([216.40.44.78]:47267 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753710AbaGTSYT (ORCPT ); Sun, 20 Jul 2014 14:24:19 -0400 Received: from filter.hostedemail.com (ff-bigip1 [10.5.19.254]) by smtprelay03.hostedemail.com (Postfix) with ESMTP id 3EE3F6A544; Sun, 20 Jul 2014 18:24:18 +0000 (UTC) X-Session-Marker: 6A6F6540706572636865732E636F6D X-Spam-Summary: 2, 0, 0, , d41d8cd98f00b204, joe@perches.com, :::::::::::::::::::::, RULES_HIT:41:355:379:541:800:960:973:988:989:1260:1345:1359:1437:1534:1542:1711:1730:1747:1777:1792:2393:2559:2562:3138:3139:3140:3141:3142:3354:3868:3871:3872:4250:4321:5007:6119:6261:7903:10004:10026:10848:11026:11658:11914:12043:12296:12438:12517:12519:12555:14096:21080, 0, RBL:none, CacheIP:none, Bayesian:0.5, 0.5, 0.5, Netcheck:none, DomainCache:0, MSF:not bulk, SPF:fn, MSBL:0, DNSBL:none, Custom_rules:0:0:0 X-HE-Tag: sleep80_5f7c55f9e574e X-Filterd-Recvd-Size: 4057 Received: from localhost.localdomain (pool-71-103-235-196.lsanca.fios.verizon.net [71.103.235.196]) (Authenticated sender: joe@perches.com) by omf07.hostedemail.com (Postfix) with ESMTPA; Sun, 20 Jul 2014 18:24:16 +0000 (UTC) From: Joe Perches To: Andrew Morton Cc: Al Viro , David Teigland , Jeff Layton , Christine Caulfield , "J. Bruce Fields" , Trond Myklebust , cluster-devel@redhat.com, linux-kernel@vger.kernel.org, linux-nfs@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 9/9] fs: dlm: lockd: Convert int result to unsigned char type Date: Sun, 20 Jul 2014 11:23:43 -0700 Message-Id: <65b9ba0dba9c79a938267d5bed7ed0a8211e89ed.1405879494.git.joe@perches.com> X-Mailer: git-send-email 1.8.1.2.459.gbcd45b4.dirty In-Reply-To: References: Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP op->info.rv is an s32, but it's only used as a u8. Signed-off-by: Joe Perches --- fs/dlm/plock.c | 6 +++--- fs/lockd/svclock.c | 10 +++++----- include/linux/fs.h | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/fs/dlm/plock.c b/fs/dlm/plock.c index 3e0b6fc..267849d 100644 --- a/fs/dlm/plock.c +++ b/fs/dlm/plock.c @@ -30,7 +30,7 @@ struct plock_op { struct plock_xop { struct plock_op xop; - int (*callback)(struct file_lock *fl, int result); + int (*callback)(struct file_lock *fl, unsigned char type); void *fl; void *file; struct file_lock flc; @@ -190,7 +190,7 @@ static int dlm_plock_callback(struct plock_op *op) struct file *file; struct file_lock *fl; struct file_lock *flc; - int (*notify)(struct file_lock *fl, int result) = NULL; + int (*notify)(struct file_lock *fl, unsigned char type) = NULL; struct plock_xop *xop = (struct plock_xop *)op; int rv = 0; @@ -209,7 +209,7 @@ static int dlm_plock_callback(struct plock_op *op) notify = xop->callback; if (op->info.rv) { - notify(fl, op->info.rv); + notify(fl, (unsigned char)op->info.rv); goto out; } diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c index 2a61701..15532b9 100644 --- a/fs/lockd/svclock.c +++ b/fs/lockd/svclock.c @@ -667,16 +667,16 @@ nlmsvc_cancel_blocked(struct net *net, struct nlm_file *file, struct nlm_lock *l * deferred rpc for GETLK and SETLK. */ static void -nlmsvc_update_deferred_block(struct nlm_block *block, int result) +nlmsvc_update_deferred_block(struct nlm_block *block, unsigned char type) { block->b_flags |= B_GOT_CALLBACK; - if (result == 0) + if (type == 0) block->b_granted = 1; else block->b_flags |= B_TIMED_OUT; } -static int nlmsvc_grant_deferred(struct file_lock *fl, int result) +static int nlmsvc_grant_deferred(struct file_lock *fl, unsigned char type) { struct nlm_block *block; int rc = -ENOENT; @@ -691,8 +691,8 @@ static int nlmsvc_grant_deferred(struct file_lock *fl, int result) rc = -ENOLCK; break; } - nlmsvc_update_deferred_block(block, result); - } else if (result == 0) + nlmsvc_update_deferred_block(block, type); + } else if (type == 0) block->b_granted = 1; nlmsvc_insert_block_locked(block, 0); diff --git a/include/linux/fs.h b/include/linux/fs.h index d083a67..7fbce66 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -842,7 +842,7 @@ struct lock_manager_operations { int (*lm_compare_owner)(struct file_lock *fl1, struct file_lock *fl2); unsigned long (*lm_owner_key)(struct file_lock *fl); void (*lm_notify)(struct file_lock *fl); /* unblock callback */ - int (*lm_grant)(struct file_lock *fl, int result); + int (*lm_grant)(struct file_lock *fl, unsigned char type); void (*lm_break)(struct file_lock *fl); int (*lm_change)(struct file_lock **fl, int type); };