autofs4: coding style fixes (e9a7c2f1) · Commits · e / devices / android_kernel_teracube_mt6765

fs/autofs4/autofs_i.h

+27 −28

Original line number	Diff line number	Diff line
		/* -- c -- ------------------------------------------------------------- *
		*
		* linux/fs/autofs/autofs_i.h
		*
		/*
		* Copyright 1997-1998 Transmeta Corporation - All Rights Reserved
		* Copyright 2005-2006 Ian Kent <raven@themaw.net>
		*
		* This file is part of the Linux kernel and is made available under
		* the terms of the GNU General Public License, version 2, or at your
		* option, any later version, incorporated herein by reference.
		*
		* ----------------------------------------------------------------------- */
		*/

		/* Internal header file for autofs */

		@@ -35,7 +31,7 @@
		#include <linux/mount.h>
		#include <linux/namei.h>
		#include <asm/current.h>
		#include <asm/uaccess.h>
		#include <linux/uaccess.h>

		/* #define DEBUG */

		@@ -51,12 +47,14 @@
		printk(KERN_ERR "pid %d: %s: " fmt "\n", \
		current->pid, __func__, ##__VA_ARGS__)

		/* Unified info structure. This is pointed to by both the dentry and
		inode structures. Each file in the filesystem has an instance of this
		structure. It holds a reference to the dentry, so dentries are never
		flushed while the file exists. All name lookups are dealt with at the
		dentry level, although the filesystem can interfere in the validation
		process. Readdir is implemented by traversing the dentry lists. */
		/*
		* Unified info structure. This is pointed to by both the dentry and
		* inode structures. Each file in the filesystem has an instance of this
		* structure. It holds a reference to the dentry, so dentries are never
		* flushed while the file exists. All name lookups are dealt with at the
		* dentry level, although the filesystem can interfere in the validation
		* process. Readdir is implemented by traversing the dentry lists.
		*/
		struct autofs_info {
		struct dentry *dentry;
		struct inode *inode;
		@@ -78,7 +76,7 @@ struct autofs_info {
		kgid_t gid;
		};

		#define AUTOFS_INF_EXPIRING (1<<0) /* dentry is in the process of expiring */
		#define AUTOFS_INF_EXPIRING (1<<0) /* dentry in the process of expiring */
		#define AUTOFS_INF_NO_RCU (1<<1) /* the dentry is being considered
		* for expiry, so RCU_walk is
		* not permitted
		@@ -140,10 +138,11 @@ static inline struct autofs_info autofs4_dentry_ino(struct dentry dentry)
		}

		/* autofs4_oz_mode(): do we see the man behind the curtain? (The
		processes which do manipulations for us in user space sees the raw
		filesystem without "magic".) */

		static inline int autofs4_oz_mode(struct autofs_sb_info *sbi) {
		* processes which do manipulations for us in user space sees the raw
		* filesystem without "magic".)
		*/
		static inline int autofs4_oz_mode(struct autofs_sb_info *sbi)
		{
		return sbi->catatonic \|\| task_pgrp(current) == sbi->oz_pgrp;
		}

		@@ -242,37 +241,37 @@ static inline void __autofs4_add_expiring(struct dentry *dentry)
		{
		struct autofs_sb_info *sbi = autofs4_sbi(dentry->d_sb);
		struct autofs_info *ino = autofs4_dentry_ino(dentry);

		if (ino) {
		if (list_empty(&ino->expiring))
		list_add(&ino->expiring, &sbi->expiring_list);
		}
		return;
		}

		static inline void autofs4_add_expiring(struct dentry *dentry)
		{
		struct autofs_sb_info *sbi = autofs4_sbi(dentry->d_sb);
		struct autofs_info *ino = autofs4_dentry_ino(dentry);

		if (ino) {
		spin_lock(&sbi->lookup_lock);
		if (list_empty(&ino->expiring))
		list_add(&ino->expiring, &sbi->expiring_list);
		spin_unlock(&sbi->lookup_lock);
		}
		return;
		}

		static inline void autofs4_del_expiring(struct dentry *dentry)
		{
		struct autofs_sb_info *sbi = autofs4_sbi(dentry->d_sb);
		struct autofs_info *ino = autofs4_dentry_ino(dentry);

		if (ino) {
		spin_lock(&sbi->lookup_lock);
		if (!list_empty(&ino->expiring))
		list_del_init(&ino->expiring);
		spin_unlock(&sbi->lookup_lock);
		}
		return;
		}

		extern void autofs4_kill_sb(struct super_block *);

fs/autofs4/dev-ioctl.c

+17 −11

Original line number	Diff line number	Diff line
		@@ -72,8 +72,8 @@ static int check_dev_ioctl_version(int cmd, struct autofs_dev_ioctl *param)
		{
		int err = 0;

		if ((AUTOFS_DEV_IOCTL_VERSION_MAJOR != param->ver_major) \|\|
		(AUTOFS_DEV_IOCTL_VERSION_MINOR < param->ver_minor)) {
		if ((param->ver_major != AUTOFS_DEV_IOCTL_VERSION_MAJOR) \|\|
		(param->ver_minor > AUTOFS_DEV_IOCTL_VERSION_MINOR)) {
		AUTOFS_WARN("ioctl control interface version mismatch: "
		"kernel(%u.%u), user(%u.%u), cmd(%d)",
		AUTOFS_DEV_IOCTL_VERSION_MAJOR,
		@@ -93,7 +93,8 @@ static int check_dev_ioctl_version(int cmd, struct autofs_dev_ioctl *param)
		* Copy parameter control struct, including a possible path allocated
		* at the end of the struct.
		*/
		static struct autofs_dev_ioctl copy_dev_ioctl(struct autofs_dev_ioctl __user in)
		static struct autofs_dev_ioctl *
		copy_dev_ioctl(struct autofs_dev_ioctl __user *in)
		{
		struct autofs_dev_ioctl tmp, *res;

		@@ -116,7 +117,6 @@ static struct autofs_dev_ioctl copy_dev_ioctl(struct autofs_dev_ioctl __user i
		static inline void free_dev_ioctl(struct autofs_dev_ioctl *param)
		{
		kfree(param);
		return;
		}

		/*
		@@ -197,7 +197,9 @@ static int find_autofs_mount(const char *pathname,
		void *data)
		{
		struct path path;
		int err = kern_path_mountpoint(AT_FDCWD, pathname, &path, 0);
		int err;

		err = kern_path_mountpoint(AT_FDCWD, pathname, &path, 0);
		if (err)
		return err;
		err = -ENOENT;
		@@ -225,6 +227,7 @@ static int test_by_dev(struct path path, void p)
		static int test_by_type(struct path path, void p)
		{
		struct autofs_info *ino = autofs4_dentry_ino(path->dentry);

		return ino && ino->sbi->type & (unsigned )p;
		}

		@@ -456,8 +459,10 @@ static int autofs_dev_ioctl_requester(struct file *fp,
		err = 0;
		autofs4_expire_wait(path.dentry, 0);
		spin_lock(&sbi->fs_lock);
		param->requester.uid = from_kuid_munged(current_user_ns(), ino->uid);
		param->requester.gid = from_kgid_munged(current_user_ns(), ino->gid);
		param->requester.uid =
		from_kuid_munged(current_user_ns(), ino->uid);
		param->requester.gid =
		from_kgid_munged(current_user_ns(), ino->gid);
		spin_unlock(&sbi->fs_lock);
		}
		path_put(&path);
		@@ -619,7 +624,8 @@ static ioctl_fn lookup_dev_ioctl(unsigned int cmd)
		}

		/* ioctl dispatcher */
		static int _autofs_dev_ioctl(unsigned int command, struct autofs_dev_ioctl __user *user)
		static int _autofs_dev_ioctl(unsigned int command,
		struct autofs_dev_ioctl __user *user)
		{
		struct autofs_dev_ioctl *param;
		struct file *fp;
		@@ -711,6 +717,7 @@ static int _autofs_dev_ioctl(unsigned int command, struct autofs_dev_ioctl __use
		static long autofs_dev_ioctl(struct file *file, uint command, ulong u)
		{
		int err;

		err = _autofs_dev_ioctl(command, (struct autofs_dev_ioctl __user *) u);
		return (long) err;
		}
		@@ -757,6 +764,5 @@ int __init autofs_dev_ioctl_init(void)
		void autofs_dev_ioctl_exit(void)
		{
		misc_deregister(&_autofs_dev_ioctl_misc);
		return;
		}

fs/autofs4/expire.c

+33 −27

Original line number	Diff line number	Diff line
		/* -- c -- --------------------------------------------------------------- *
		*
		* linux/fs/autofs/expire.c
		*
		/*
		* Copyright 1997-1998 Transmeta Corporation -- All Rights Reserved
		* Copyright 1999-2000 Jeremy Fitzhardinge <jeremy@goop.org>
		* Copyright 2001-2006 Ian Kent <raven@themaw.net>
		@@ -9,8 +6,7 @@
		* This file is part of the Linux kernel and is made available under
		* the terms of the GNU General Public License, version 2, or at your
		* option, any later version, incorporated herein by reference.
		*
		* ------------------------------------------------------------------------- */
		*/

		#include "autofs_i.h"

		@@ -58,7 +54,9 @@ static int autofs4_mount_busy(struct vfsmount mnt, struct dentry dentry)

		/* Update the expiry counter if fs is busy */
		if (!may_umount_tree(path.mnt)) {
		struct autofs_info *ino = autofs4_dentry_ino(top);
		struct autofs_info *ino;

		ino = autofs4_dentry_ino(top);
		ino->last_used = jiffies;
		goto done;
		}
		@@ -195,7 +193,9 @@ static int autofs4_direct_busy(struct vfsmount *mnt,

		/* If it's busy update the expiry counters */
		if (!may_umount_tree(mnt)) {
		struct autofs_info *ino = autofs4_dentry_ino(top);
		struct autofs_info *ino;

		ino = autofs4_dentry_ino(top);
		if (ino)
		ino->last_used = jiffies;
		return 1;
		@@ -208,7 +208,8 @@ static int autofs4_direct_busy(struct vfsmount *mnt,
		return 0;
		}

		/* Check a directory tree of mount points for busyness
		/*
		* Check a directory tree of mount points for busyness
		* The tree is not busy iff no mountpoints are busy
		*/
		static int autofs4_tree_busy(struct vfsmount *mnt,
		@@ -404,6 +405,7 @@ static struct dentry should_expire(struct dentry dentry,
		} else {
		/* Path walk currently on this dentry? */
		struct dentry *expired;

		ino_count = atomic_read(&ino->count) + 1;
		if (d_count(dentry) > ino_count)
		return NULL;
		@@ -531,12 +533,13 @@ int autofs4_expire_run(struct super_block *sb,
		struct dentry *dentry;
		int ret = 0;

		memset(&pkt,0,sizeof pkt);
		memset(&pkt, 0, sizeof(pkt));

		pkt.hdr.proto_version = sbi->version;
		pkt.hdr.type = autofs_ptype_expire;

		if ((dentry = autofs4_expire_indirect(sb, mnt, sbi, 0)) == NULL)
		dentry = autofs4_expire_indirect(sb, mnt, sbi, 0);
		if (!dentry)
		return -EAGAIN;

		pkt.len = dentry->d_name.len;
		@@ -573,7 +576,8 @@ int autofs4_do_expire_multi(struct super_block sb, struct vfsmount mnt,
		struct autofs_info *ino = autofs4_dentry_ino(dentry);

		/* This is synchronous because it makes the daemon a
		little easier */
		* little easier
		*/
		ret = autofs4_wait(sbi, dentry, NFY_EXPIRE);

		spin_lock(&sbi->fs_lock);
		@@ -588,8 +592,10 @@ int autofs4_do_expire_multi(struct super_block sb, struct vfsmount mnt,
		return ret;
		}

		/* Call repeatedly until it returns -EAGAIN, meaning there's nothing
		more to be done */
		/*
		* Call repeatedly until it returns -EAGAIN, meaning there's nothing
		* more to be done.
		*/
		int autofs4_expire_multi(struct super_block sb, struct vfsmount mnt,
		struct autofs_sb_info sbi, int __user arg)
		{

fs/autofs4/init.c

+3 −7

Original line number	Diff line number	Diff line
		/* -- c -- --------------------------------------------------------------- *
		*
		* linux/fs/autofs/init.c
		*
		/*
		* Copyright 1997-1998 Transmeta Corporation -- All Rights Reserved
		*
		* This file is part of the Linux kernel and is made available under
		* the terms of the GNU General Public License, version 2, or at your
		* option, any later version, incorporated herein by reference.
		*
		* ------------------------------------------------------------------------- */
		*/

		#include <linux/module.h>
		#include <linux/init.h>

fs/autofs4/inode.c

+12 −13

Original line number	Diff line number	Diff line
		/* -- c -- --------------------------------------------------------------- *
		*
		* linux/fs/autofs/inode.c
		*
		/*
		* Copyright 1997-1998 Transmeta Corporation -- All Rights Reserved
		* Copyright 2005-2006 Ian Kent <raven@themaw.net>
		*
		* This file is part of the Linux kernel and is made available under
		* the terms of the GNU General Public License, version 2, or at your
		* option, any later version, incorporated herein by reference.
		*
		* ------------------------------------------------------------------------- */
		*/

		#include <linux/kernel.h>
		#include <linux/slab.h>
		@@ -24,7 +20,9 @@

		struct autofs_info autofs4_new_ino(struct autofs_sb_info sbi)
		{
		struct autofs_info ino = kzalloc(sizeof(ino), GFP_KERNEL);
		struct autofs_info *ino;

		ino = kzalloc(sizeof(*ino), GFP_KERNEL);
		if (ino) {
		INIT_LIST_HEAD(&ino->active);
		INIT_LIST_HEAD(&ino->expiring);
		@@ -152,6 +150,7 @@ static int parse_options(char options, int pipefd, kuid_t uid, kgid_t gid,

		while ((p = strsep(&options, ",")) != NULL) {
		int token;

		if (!*p)
		continue;