jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-31 05:27:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Linux: Fix misleading indentation and other whitespace

Browse Source 
Commit 7edc6694e7632c9736bd1516935604a638165313 introduced a
misleading indentation of a line in afs_linux_prefetch. Correct
it, and once here remove trailing whitespace throughout the file.

Reviewed-on: https://gerrit.openafs.org/12253
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
(cherry picked from commit 3609ebcfa3f70ca7612364c0cc2345b1d7f1096b)

Change-Id: I0d42c6751b835308c692c0ebb7d217f56ad5cf2a
Reviewed-on: https://gerrit.openafs.org/12254
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
This commit is contained in:
Stephan Wiesand 2016-04-07 10:58:30 +02:00
parent 0e72e84637
commit bfd7fced97
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/afs/LINUX/osi_vnodeops.c
View File

@ -1,7 +1,7 @@
/*
* Copyright 2000, International Business Machines Corporation and others.
* All Rights Reserved.
*
*
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
@ -14,7 +14,7 @@
* So far the only truly scary part is that Linux relies on the inode cache
* to be up to date. Don't you dare break a callback and expect an fstat
* to give you meaningful information. This appears to be fixed in the 2.1
* development kernels. As it is we can fix this now by intercepting the
* development kernels. As it is we can fix this now by intercepting the
* stat calls.
*/
@ -431,7 +431,7 @@ afs_linux_readdir(struct file *fp, void *dirbuf, filldir_t filldir)
/* clean up from afs_FindVCache */
afs_PutVCache(tvc);
}
/*
/*
* If this is NFS readdirplus, then the filler is going to
* call getattr on this inode, which will deadlock if we're
* holding the GLOCK.
@ -592,7 +592,7 @@ afs_linux_lock(struct file *fp, int cmd, struct file_lock *flp)
struct vcache *vcp = VTOAFS(FILE_INODE(fp));
cred_t *credp = crref();
struct AFS_FLOCK flock;
/* Convert to a lock format afs_lockctl understands. */
memset(&flock, 0, sizeof(flock));
flock.l_type = flp->fl_type;
@ -618,7 +618,7 @@ afs_linux_lock(struct file *fp, int cmd, struct file_lock *flp)
code = afs_convert_code(afs_lockctl(vcp, &flock, cmd, credp));
AFS_GUNLOCK();
if ((code == 0 || flp->fl_type == F_UNLCK) &&
if ((code == 0 || flp->fl_type == F_UNLCK) &&
(cmd == F_SETLK || cmd == F_SETLKW)) {
code = afs_posix_lock_file(fp, flp);
if (code && flp->fl_type != F_UNLCK) {
@ -641,7 +641,7 @@ afs_linux_lock(struct file *fp, int cmd, struct file_lock *flp)
return 0;
}
}
/* Convert flock back to Linux's file_lock */
flp->fl_type = flock.l_type;
flp->fl_pid = flock.l_pid;
@ -684,7 +684,7 @@ afs_linux_flock(struct file *fp, int cmd, struct file_lock *flp) {
code = afs_convert_code(afs_lockctl(vcp, &flock, cmd, credp));
AFS_GUNLOCK();
if ((code == 0 || flp->fl_type == F_UNLCK) &&
if ((code == 0 || flp->fl_type == F_UNLCK) &&
(cmd == F_SETLK || cmd == F_SETLKW)) {
flp->fl_flags &=~ FL_SLEEP;
code = flock_lock_file_wait(fp, flp);
@ -1140,7 +1140,7 @@ afs_linux_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *sta
/* Validate a dentry. Return 1 if unchanged, 0 if VFS layer should re-evaluate.
* In kernels 2.2.10 and above, we are passed an additional flags var which
* may have either the LOOKUP_FOLLOW OR LOOKUP_DIRECTORY set in which case
* we are advised to follow the entry if it is a link or to make sure that
* we are advised to follow the entry if it is a link or to make sure that
* it is a directory. But since the kernel itself checks these possibilities
* later on, we shouldn't have to do it until later. Perhaps in the future..
*/
@ -1346,7 +1346,7 @@ afs_linux_dentry_revalidate(struct dentry *dp, int flags)
bad_dentry:
if (have_submounts(dp))
valid = 1;
else
else
valid = 0;
goto done;
}
@ -1385,7 +1385,7 @@ afs_dentry_automount(afs_linux_path_t *path)
{
struct dentry *target;
/*
/*
* Avoid symlink resolution limits when resolving; we cannot contribute to
* an infinite symlink loop.
*
@ -1514,7 +1514,7 @@ afs_linux_lookup(struct inode *dip, struct dentry *dp)
AFS_GLOCK();
code = afs_lookup(VTOAFS(dip), (char *)comp, &vcp, credp);
if (!code) {
struct vattr *vattr = NULL;
struct vcache *parent_vc = VTOAFS(dip);
@ -1853,7 +1853,7 @@ afs_linux_rename(struct inode *oldip, struct dentry *olddp,
}
/* afs_linux_ireadlink
/* afs_linux_ireadlink
* Internal readlink which can return link contents to user or kernel space.
* Note that the buffer is NOT supposed to be null-terminated.
*/
@ -1879,7 +1879,7 @@ afs_linux_ireadlink(struct inode *ip, char *target, int maxlen, uio_seg_t seg)
}
#if !defined(USABLE_KERNEL_PAGE_SYMLINK_CACHE)
/* afs_linux_readlink
/* afs_linux_readlink
* Fill target (which is in user space) with contents of symlink.
*/
static int
@ -2224,7 +2224,7 @@ afs_linux_fillpage(struct file *fp, struct page *pp)
99999); /* not a possible code value */
code = afs_rdwr(avc, auio, UIO_READ, 0, credp);
afs_Trace4(afs_iclSetp, CM_TRACE_READPAGE, ICL_TYPE_POINTER, ip,
ICL_TYPE_POINTER, pp, ICL_TYPE_INT32, cnt, ICL_TYPE_INT32,
code);
@ -2270,7 +2270,7 @@ afs_linux_prefetch(struct file *fp, struct page *pp)
if (tdc) {
if (!(tdc->mflags & DFNextStarted))
afs_PrefetchChunk(avc, tdc, credp, treq);
afs_PutDCache(tdc);
afs_PutDCache(tdc);
}
ReleaseWriteLock(&avc->lock);
}
@ -3125,7 +3125,6 @@ static struct inode_operations afs_symlink_iops = {
void
afs_fill_inode(struct inode *ip, struct vattr *vattr)
{
if (vattr)
vattr2inode(ip, vattr);