From 736b5a4404b954fc609bd8f5966ac2ce64d8ce34 Mon Sep 17 00:00:00 2001 From: Erez Zadok Date: Tue, 26 Nov 2013 22:01:34 -0500 Subject: [PATCH] Unionfs: namei fixes and misc Updated lookup_one_len_nd(), update MAINTAINERS, remove old comments and copyrights. Signed-off-by: Erez Zadok --- MAINTAINERS | 18 ++++++++++-------- fs/namei.c | 36 ------------------------------------ fs/stack.c | 3 +-- include/linux/fs_stack.h | 14 +------------- 4 files changed, 12 insertions(+), 59 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 86b330c8c76..30d7c96ecb1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8881,6 +8881,16 @@ F: drivers/cdrom/cdrom.c F: include/linux/cdrom.h F: include/uapi/linux/cdrom.h +UNION FILE SYSTEM +P: Erez Zadok +M: ezk@cs.sunysb.edu +L: unionfs@filesystems.org +W: http://unionfs.filesystems.org/ +T: git git://git.fsl.cs.sunysb.edu/unionfs-latest.git +S: Maintained +F: Documentation/filesystems/unionfs/ +F: fs/unionfs/ + UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER M: Vinayak Holikatti M: Santosh Y @@ -8889,14 +8899,6 @@ S: Supported F: Documentation/scsi/ufs.txt F: drivers/scsi/ufs/ -UNIONFS -P: Erez Zadok -M: ezk@cs.sunysb.edu -L: unionfs@filesystems.org -W: http://unionfs.filesystems.org/ -T: git git.kernel.org/pub/scm/linux/kernel/git/ezk/unionfs.git -S: Maintained - UNSORTED BLOCK IMAGES (UBI) M: Artem Bityutskiy W: http://www.linux-mtd.infradead.org/ diff --git a/fs/namei.c b/fs/namei.c index ccb1b7e93fe..c53fe048cc4 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -2101,42 +2101,6 @@ struct dentry *lookup_one_len(const char *name, struct dentry *base, int len) return __lookup_hash(&this, base, 0); } -/* pass nameidata from caller (useful for NFS) */ -struct dentry *lookup_one_len_nd(const char *name, struct dentry *base, - int len, struct nameidata *nd) -{ - struct qstr this; - unsigned long hash; - unsigned int c; - - WARN_ON_ONCE(!mutex_is_locked(&base->d_inode->i_mutex)); - - this.name = name; - this.len = len; - if (!len) - return ERR_PTR(-EACCES); - - hash = init_name_hash(); - while (len--) { - c = *(const unsigned char *)name++; - if (c == '/' || c == '\0') - return ERR_PTR(-EACCES); - hash = partial_name_hash(c, hash); - } - this.hash = end_name_hash(hash); - /* - * See if the low-level filesystem might want - * to use its own hash.. - */ - if (base->d_flags & DCACHE_OP_HASH) { - int err = base->d_op->d_hash(base, base->d_inode, &this); - if (err < 0) - return ERR_PTR(err); - } - - return __lookup_hash(&this, base, nd); -} - int user_path_at_empty(int dfd, const char __user *name, unsigned flags, struct path *path, int *empty) { diff --git a/fs/stack.c b/fs/stack.c index 098ef57ef55..5b5388250e2 100644 --- a/fs/stack.c +++ b/fs/stack.c @@ -2,8 +2,7 @@ #include #include -/* - * does _NOT_ require i_mutex to be held. +/* does _NOT_ require i_mutex to be held. * * This function cannot be inlined since i_size_{read,write} is rather * heavy-weight on 32-bit systems diff --git a/include/linux/fs_stack.h b/include/linux/fs_stack.h index 64f1ced6de0..da317c7163a 100644 --- a/include/linux/fs_stack.h +++ b/include/linux/fs_stack.h @@ -1,19 +1,7 @@ -/* - * Copyright (c) 2006-2009 Erez Zadok - * Copyright (c) 2006-2007 Josef 'Jeff' Sipek - * Copyright (c) 2006-2009 Stony Brook University - * Copyright (c) 2006-2009 The Research Foundation of SUNY - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ - #ifndef _LINUX_FS_STACK_H #define _LINUX_FS_STACK_H -/* - * This file defines generic functions used primarily by stackable +/* This file defines generic functions used primarily by stackable * filesystems; none of these functions require i_mutex to be held. */ -- 2.34.1