From patchwork Thu Sep 4 12:38:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4845101 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 525039F390 for ; Thu, 4 Sep 2014 12:41:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 34B8720270 for ; Thu, 4 Sep 2014 12:41:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EE2F720272 for ; Thu, 4 Sep 2014 12:41:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753683AbaIDMjk (ORCPT ); Thu, 4 Sep 2014 08:39:40 -0400 Received: from mail-qg0-f50.google.com ([209.85.192.50]:35045 "EHLO mail-qg0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753543AbaIDMjY (ORCPT ); Thu, 4 Sep 2014 08:39:24 -0400 Received: by mail-qg0-f50.google.com with SMTP id q108so9630745qgd.23 for ; Thu, 04 Sep 2014 05:39:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=ajbg7FUTbNgOV5gE/bUI/uYA13jV1/8GJb/VVrFM6J0=; b=fljtYwGKLpBQ7EnnZjeP9EoTW0vM7IFwt6gVBsfsTgyqah13OyLCn+kFgjVO9pWhFz 1YOO6HAiYK/cR8wbSC1WAYHcZQKOLhN6E3yuydOfAmAqebHPKQkuSk05NsdXlh/olbW1 A5GdMiHyXqu1CglhPnCNiKWi1Eq98vsyBWpla8Qtra9ywBp8Fd3nKSjF9dz7FHGpgt80 4yMGGyrll7e7WVJnZY1jIHbvSZcPAC/Fw9OTAKrKgc4L5/usIQdIBhnWtTHUTB9CnZJa Pm0GClHOJ8qYU55Wy0j67AxzXNMTs+U6mAlU1CbkmTBoB+XH0Lv/DM+mW6wTshWOX2RX oViw== X-Gm-Message-State: ALoCoQmlkamnwWHVWcVs454RcrhuDh4m+l75dH5QookUau0l40rh+jkQJ+d8krzbd4nVCGomM2CA X-Received: by 10.140.81.134 with SMTP id f6mr6346820qgd.60.1409834363399; Thu, 04 Sep 2014 05:39:23 -0700 (PDT) Received: from tlielax.poochiereds.net ([2001:470:8:d63:3a60:77ff:fe93:a95d]) by mx.google.com with ESMTPSA id t5sm19186512qat.24.2014.09.04.05.39.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Sep 2014 05:39:22 -0700 (PDT) From: Jeff Layton To: linux-fsdevel@vger.kernel.org Cc: linux-nfs@vger.kernel.org, Christoph Hellwig , "J. Bruce Fields" , linux-kernel@vger.kernel.org Subject: [PATCH v2 17/17] locks: clean up comments over fl_owner_t definition Date: Thu, 4 Sep 2014 08:38:43 -0400 Message-Id: <1409834323-7171-18-git-send-email-jlayton@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1409834323-7171-1-git-send-email-jlayton@primarydata.com> References: <1409834323-7171-1-git-send-email-jlayton@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-8.5 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 The contents of an fl_owner_t have morphed a bit over the years, fix up the comments to account for the changes. Signed-off-by: Jeff Layton --- include/linux/fs.h | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/include/linux/fs.h b/include/linux/fs.h index ed4e1897099c..a51be79b7dc3 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -852,11 +852,19 @@ static inline struct file *get_file(struct file *f) #define FILE_LOCK_DEFERRED 1 /* - * The POSIX file lock owner is determined by - * the "struct files_struct" in the thread group - * (or NULL for no owner - BSD locks). + * A generic "file lock owner" value. This is set differently for different + * types of locks. * - * Lockd stuffs a "host" pointer into this. + * The POSIX file lock owner is determined by the "struct files_struct" in the + * thread group. + * + * Flock (BSD) locks, OFD locks and leases set the fl_owner to the + * file description pointer. + * + * lockd stuffs a "host" pointer into this + * + * nfsd stuffs a * nfs4_file pointer into this for leases, and a lockowner + * pointer into it for v4 locks. */ typedef void *fl_owner_t;