The patch titled
Subject: autofs4: fix coding style problem in autofs4_get_set_timeout()
has been added to the -mm tree. Its filename is
autofs4-fix-coding-style-problem-in-autofs4_get_set_timeout.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/autofs4-fix-coding-style-problem-in-autofs4_get_set_timeout.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/autofs4-fix-coding-style-problem-in-autofs4_get_set_timeout.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Ian Kent <raven@xxxxxxxxxx>
Subject: autofs4: fix coding style problem in autofs4_get_set_timeout()
Refactor autofs4_get_set_timeout() to eliminate coding style error.
Signed-off-by: Ian Kent <raven@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/autofs4/root.c | 28 ++++++++++++++++++++--------
1 file changed, 20 insertions(+), 8 deletions(-)
diff -puN fs/autofs4/root.c~autofs4-fix-coding-style-problem-in-autofs4_get_set_timeout fs/autofs4/root.c
--- a/fs/autofs4/root.c~autofs4-fix-coding-style-problem-in-autofs4_get_set_timeout
+++ a/fs/autofs4/root.c
@@ -774,12 +774,16 @@ static int autofs4_dir_mkdir(struct inod
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
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_timeou
sbi->exp_timeout = ntimeout * HZ;
return 0;
+error:
+ return rv;
}
/* Return protocol version */
_
Patches currently in -mm which might be from raven@xxxxxxxxxx are
autofs4-coding-style-fixes.patch
autofs4-fix-coding-style-problem-in-autofs4_get_set_timeout.patch
autofs4-fix-coding-style-line-length-in-autofs4_wait.patch
autofs4-fix-invalid-ioctl-return-in-autofs4_root_ioctl_unlocked.patch
autofs4-fix-some-white-space-errors.patch
autofs4-fix-stringh-include-in-auto_dev-ioctlh.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
