diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-02 16:41:36 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-02 16:41:36 -0500 |
| commit | 923a789b49c7269a0245d5af6afe486188d940df (patch) | |
| tree | c3f168427372e64f7467a794f313416da5086ba0 /include/linux/namei.h | |
| parent | 103ceffb9501531f6931df6aebc11a05189201f0 (diff) | |
| parent | b840d79631c882786925303c2b0f4fefc31845ed (diff) | |
Merge branch 'linus' into x86/cleanups
Conflicts:
arch/x86/kernel/reboot.c
Diffstat (limited to 'include/linux/namei.h')
| -rw-r--r-- | include/linux/namei.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/namei.h b/include/linux/namei.h index 99eb80306dc5..fc2e03579877 100644 --- a/include/linux/namei.h +++ b/include/linux/namei.h | |||
| @@ -94,4 +94,9 @@ static inline char *nd_get_link(struct nameidata *nd) | |||
| 94 | return nd->saved_names[nd->depth]; | 94 | return nd->saved_names[nd->depth]; |
| 95 | } | 95 | } |
| 96 | 96 | ||
| 97 | static inline void nd_terminate_link(void *name, size_t len, size_t maxlen) | ||
| 98 | { | ||
| 99 | ((char *) name)[min(len, maxlen)] = '\0'; | ||
| 100 | } | ||
| 101 | |||
| 97 | #endif /* _LINUX_NAMEI_H */ | 102 | #endif /* _LINUX_NAMEI_H */ |