Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa330ddc authored by Ian Kent's avatar Ian Kent Committed by Linus Torvalds
Browse files

autofs4: fix coding style problem in autofs4_get_set_timeout() 



Refactor autofs4_get_set_timeout() to eliminate coding style error.

Signed-off-by: default avatarIan Kent <raven@themaw.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e9a7c2f1

fs/autofs4/root.c

+20 −8
Original line number Diff line number Diff line
@@ -774,12 +774,16 @@ static int autofs4_dir_mkdir(struct inode *dir, 
static inline int autofs4_compat_get_set_timeout(struct autofs_sb_info *sbi,

						 compat_ulong_t __user *p)

{

	int rv;

	unsigned long ntimeout;

	int rv;



	if ((rv = get_user(ntimeout, p)) ||

	     (rv = put_user(sbi->exp_timeout/HZ, p)))

		return rv;

	rv = get_user(ntimeout, p);

	if (rv)

		goto error;



	rv = put_user(sbi->exp_timeout/HZ, p);

	if (rv)

		goto error;



	if (ntimeout > UINT_MAX/HZ)

		sbi->exp_timeout = 0;
@@ -787,18 +791,24 @@ static inline int autofs4_compat_get_set_timeout(struct autofs_sb_info *sbi, 
		sbi->exp_timeout = ntimeout * HZ;



	return 0;

error:

	return rv;

}

#endif



static inline int autofs4_get_set_timeout(struct autofs_sb_info *sbi,

					  unsigned long __user *p)

{

	int rv;

	unsigned long ntimeout;

	int rv;



	if ((rv = get_user(ntimeout, p)) ||

	     (rv = put_user(sbi->exp_timeout/HZ, p)))

		return rv;

	rv = get_user(ntimeout, p);

	if (rv)

		goto error;



	rv = put_user(sbi->exp_timeout/HZ, p);

	if (rv)

		goto error;



	if (ntimeout > ULONG_MAX/HZ)

		sbi->exp_timeout = 0;
@@ -806,6 +816,8 @@ static inline int autofs4_get_set_timeout(struct autofs_sb_info *sbi, 
		sbi->exp_timeout = ntimeout * HZ;



	return 0;

error:

	return rv;

}



/* Return protocol version */