Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp3532598imu; Sun, 11 Nov 2018 17:19:41 -0800 (PST) X-Google-Smtp-Source: AJdET5dUAZo8VygTN9eNX6ZyvzGxQVNdGtl2YyQH9xQCrPsiBtKNxrUASO0NJ0LgIh+RCayubyiL X-Received: by 2002:a63:eb0e:: with SMTP id t14mr15872358pgh.445.1541985581078; Sun, 11 Nov 2018 17:19:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541985581; cv=none; d=google.com; s=arc-20160816; b=IdMvQhnH/Wi9THRHNswEvQ29gzRg2roL1yJfNcTCoTZ6PotGKgZ557UyE8L0VZC9uw ZT/KRc9ZkYtHh0uaOb6ff8Cqo2SO2+L3EIyEjSsWXo/psAeI5TguQKjWFmcOz8DXT4iL 6WVOzbi2mW2mILTkESiV9EGxy2a43+WJ6OOwbcalvqEih0lFaEpDnbd4dhcCyLYm8og7 b2xl69vOjIF80y0zsFUS9utC5kD8tVA8RQ222jtV9t08TtPhZhUampdZQPE9nLQhViqP uKv95PSWxZQWw0YflgfBTFXoUQzaU/sufm9YqV9P86p3QuMAA4CqJXzO8qtsEWuEbQb3 dSYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:cc:subject:date:to :from; bh=7dszKt5+fFgpvNP+2OcChRTAq3uDOGvuf78cG7Res+o=; b=kKtz36HqCkG1bc/GOA50pkmGMeQUahRIHyuwjZJg1kK6E1S0LT71u+TCffwmBmPxN6 tDYBO6rbw+lwkkSy2sxqoXxo/xGdRdsFGjhuAjv/ehYVN2njGJeVJFUWmkSWAPv+aIWm Xwyo6WCZm8e1viQn8GhircrujnJev5q85zASOyR15xd/Bw/E1uSFFyGmq2Vez01iOJX5 23kHtoIxoLP0IZnUg+g1B2VFH0l7hOiUriubxkD25AA40NqVHd4Xpkjl9/q1wFALUahW WKKz2vFgPeCRhxLKT3EeTPiGEgSdh4MUZ5JpIspDb+MD3MCu4rmhkpmqFS4BiDEjUJ60 PWqA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id cb2-v6si17836428plb.227.2018.11.11.17.19.25; Sun, 11 Nov 2018 17:19:41 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730311AbeKLLIp (ORCPT + 99 others); Mon, 12 Nov 2018 06:08:45 -0500 Received: from mx2.suse.de ([195.135.220.15]:56986 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726674AbeKLLIo (ORCPT ); Mon, 12 Nov 2018 06:08:44 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 488E0ADE6; Mon, 12 Nov 2018 01:18:01 +0000 (UTC) From: NeilBrown To: Jeff Layton , Alexander Viro Date: Mon, 12 Nov 2018 12:14:49 +1100 Subject: [PATCH 12/12] VFS: locks: remove unnecessary white space. Cc: "J. Bruce Fields" , Martin Wilck , linux-fsdevel@vger.kernel.org, Frank Filz , linux-kernel@vger.kernel.org Message-ID: <154198528934.14364.12680094129855648551.stgit@noble> In-Reply-To: <154198490921.14364.13726904731989686092.stgit@noble> References: <154198490921.14364.13726904731989686092.stgit@noble> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org - spaces before tabs, - spaces at the end of lines, - multiple blank lines, - blank lines before EXPORT_SYMBOL, can all go. Signed-off-by: NeilBrown --- fs/locks.c | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/fs/locks.c b/fs/locks.c index d306ae7da9f6..f456cd3d9d50 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -11,11 +11,11 @@ * * Miscellaneous edits, and a total rewrite of posix_lock_file() code. * Kai Petzke (wpp@marie.physik.tu-berlin.de), 1994 - * + * * Converted file_lock_table to a linked list from an array, which eliminates * the limits on how many active file locks are open. * Chad Page (pageone@netcom.com), November 27, 1994 - * + * * Removed dependency on file descriptors. dup()'ed file descriptors now * get the same locks as the original file descriptors, and a close() on * any file descriptor removes ALL the locks on the file for the current @@ -41,7 +41,7 @@ * with a file pointer (filp). As a result they can be shared by a parent * process and its children after a fork(). They are removed when the last * file descriptor referring to the file pointer is closed (unless explicitly - * unlocked). + * unlocked). * * FL_FLOCK locks never deadlock, an existing lock is always removed before * upgrading from shared to exclusive (or vice versa). When this happens @@ -50,7 +50,7 @@ * Andy Walker (andy@lysaker.kvaerner.no), June 09, 1995 * * Removed some race conditions in flock_lock_file(), marked other possible - * races. Just grep for FIXME to see them. + * races. Just grep for FIXME to see them. * Dmitry Gorodchanin (pgmdsg@ibi.com), February 09, 1996. * * Addressed Dmitry's concerns. Deadlock checking no longer recursive. @@ -399,7 +399,6 @@ void locks_init_lock(struct file_lock *fl) memset(fl, 0, sizeof(struct file_lock)); locks_init_lock_heads(fl); } - EXPORT_SYMBOL(locks_init_lock); /* @@ -439,7 +438,6 @@ void locks_copy_lock(struct file_lock *new, struct file_lock *fl) fl->fl_ops->fl_copy_lock(new, fl); } } - EXPORT_SYMBOL(locks_copy_lock); static void locks_move_blocks(struct file_lock *new, struct file_lock *fl) @@ -475,7 +473,7 @@ flock_make_lock(struct file *filp, unsigned int cmd, struct file_lock *fl) if (type < 0) return ERR_PTR(type); - + if (fl == NULL) { fl = locks_alloc_lock(); if (fl == NULL) @@ -490,7 +488,7 @@ flock_make_lock(struct file *filp, unsigned int cmd, struct file_lock *fl) fl->fl_flags = FL_FLOCK; fl->fl_type = type; fl->fl_end = OFFSET_MAX; - + return fl; } @@ -1148,8 +1146,8 @@ static int posix_lock_inode(struct inode *inode, struct file_lock *request, } spin_unlock(&blocked_lock_lock); goto out; - } - } + } + } /* If we're just looking for a conflict, we're done. */ error = 0; @@ -1444,7 +1442,6 @@ int locks_mandatory_area(struct inode *inode, struct file *filp, loff_t start, return error; } - EXPORT_SYMBOL(locks_mandatory_area); #endif /* CONFIG_MANDATORY_FILE_LOCKING */ @@ -1646,7 +1643,6 @@ int __break_lease(struct inode *inode, unsigned int mode, unsigned int type) locks_free_lock(new_fl); return error; } - EXPORT_SYMBOL(__break_lease); /** @@ -1677,7 +1673,6 @@ void lease_get_mtime(struct inode *inode, struct timespec64 *time) if (has_lease) *time = current_time(inode); } - EXPORT_SYMBOL(lease_get_mtime); /** @@ -1732,8 +1727,8 @@ int fcntl_getlease(struct file *filp) /** * check_conflicting_open - see if the given dentry points to a file that has - * an existing open that would conflict with the - * desired lease. + * an existing open that would conflict with the + * desired lease. * @dentry: dentry to check * @arg: type of lease that we're trying to acquire * @flags: current lock flags @@ -1957,7 +1952,7 @@ EXPORT_SYMBOL(generic_setlease); * @arg: type of lease to obtain * @lease: file_lock to use when adding a lease * @priv: private info for lm_setup when adding a lease (may be - * NULL if lm_setup doesn't require it) + * NULL if lm_setup doesn't require it) * * Call this to establish a lease on the file. The "lease" argument is not * used for F_UNLCK requests and may be NULL. For commands that set or alter @@ -2245,7 +2240,7 @@ int fcntl_getlk(struct file *filp, unsigned int cmd, struct flock *flock) error = vfs_test_lock(filp, fl); if (error) goto out; - + flock->l_type = fl->fl_type; if (fl->fl_type != F_UNLCK) { error = posix_lock_to_flock(flock, fl); @@ -2593,7 +2588,6 @@ void locks_remove_posix(struct file *filp, fl_owner_t owner) lock.fl_ops->fl_release_private(&lock); trace_locks_remove_posix(inode, &lock, error); } - EXPORT_SYMBOL(locks_remove_posix); /* The i_flctx must be valid when calling into here */ @@ -2679,7 +2673,6 @@ int vfs_cancel_lock(struct file *filp, struct file_lock *fl) return filp->f_op->lock(filp, F_CANCELLK, fl); return 0; } - EXPORT_SYMBOL_GPL(vfs_cancel_lock); #ifdef CONFIG_PROC_FS @@ -2879,7 +2872,6 @@ static int __init filelock_init(void) filelock_cache = kmem_cache_create("file_lock_cache", sizeof(struct file_lock), 0, SLAB_PANIC, NULL); - for_each_possible_cpu(i) { struct file_lock_list_struct *fll = per_cpu_ptr(&file_lock_list, i); @@ -2889,5 +2881,4 @@ static int __init filelock_init(void) return 0; } - core_initcall(filelock_init);