Commit 27787ba3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull misc vfs updates from Al Viro:
 "Assorted stuff all over the place"

* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  useful constants: struct qstr for ".."
  hostfs_open(): don't open-code file_dentry()
  whack-a-mole: kill strlen_user() (again)
  autofs: should_expire() argument is guaranteed to be positive
  apparmor:match_mn() - constify devpath argument
  buffer: a small optimization in grow_buffers
  get rid of autofs_getpath()
  constify dentry argument of dentry_path()/dentry_path_raw()
parents b28866f4 80e5d1ff

arch/csky/include/asm/uaccess.h

+0 −2
Original line number Diff line number Diff line
@@ -397,8 +397,6 @@ long __strncpy_from_user(char *dst, const char *src, long count); 
 */

long strnlen_user(const char *src, long n);



#define strlen_user(str) strnlen_user(str, 32767)



struct exception_table_entry {

	unsigned long insn;

	unsigned long nextinsn;

arch/csky/lib/usercopy.c

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ long strncpy_from_user(char *dst, const char *src, long count) 
EXPORT_SYMBOL(strncpy_from_user);



/*

 * strlen_user: - Get the size of a string in user space.

 * strnlen_user: - Get the size of a string in user space.

 * @str: The string to measure.

 * @n:   The maximum valid length

 *

arch/nds32/include/asm/uaccess.h

+0 −1
Original line number Diff line number Diff line
@@ -260,7 +260,6 @@ do { \ 


extern unsigned long __arch_clear_user(void __user * addr, unsigned long n);

extern long strncpy_from_user(char *dest, const char __user * src, long count);

extern __must_check long strlen_user(const char __user * str);

extern __must_check long strnlen_user(const char __user * str, long n);

extern unsigned long __arch_copy_from_user(void *to, const void __user * from,

                                           unsigned long n);

arch/nios2/include/asm/uaccess.h

+0 −1
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ raw_copy_to_user(void __user *to, const void *from, unsigned long n); 


extern long strncpy_from_user(char *__to, const char __user *__from,

			      long __len);

extern __must_check long strlen_user(const char __user *str);

extern __must_check long strnlen_user(const char __user *s, long n);



/* Optimized macros */

arch/riscv/include/asm/uaccess.h

+0 −1
Original line number Diff line number Diff line
@@ -375,7 +375,6 @@ raw_copy_to_user(void __user *to, const void *from, unsigned long n) 


extern long strncpy_from_user(char *dest, const char __user *src, long count);



extern long __must_check strlen_user(const char __user *str);

extern long __must_check strnlen_user(const char __user *str, long n);



extern