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

Commit 00cd8dd3 authored by Al Viro's avatar Al Viro
Browse files

stop passing nameidata to ->lookup() 



Just the flags; only NFS cares even about that, but there are
legitimate uses for such argument.  And getting rid of that
completely would require splitting ->lookup() into a couple
of methods (at least), so let's leave that alone for now...

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 201f956e

Documentation/filesystems/Locking

+1 −2
Original line number Diff line number Diff line
@@ -38,8 +38,7 @@ d_manage: no no yes (ref-walk) maybe 
--------------------------- inode_operations --------------------------- 

prototypes:

	int (*create) (struct inode *,struct dentry *,umode_t, struct nameidata *);

	struct dentry * (*lookup) (struct inode *,struct dentry *, struct nameid

ata *);

	struct dentry * (*lookup) (struct inode *,struct dentry *, unsigned int);

	int (*link) (struct dentry *,struct inode *,struct dentry *);

	int (*unlink) (struct inode *,struct dentry *);

	int (*symlink) (struct inode *,struct dentry *,const char *);

Documentation/filesystems/porting

+2 −2
Original line number Diff line number Diff line
@@ -434,5 +434,5 @@ d_make_root() drops the reference to inode if dentry allocation fails. 


--

[mandatory]

	The witch is dead!  Well, 1/3 of it, anyway.  ->d_revalidate() does *not*

take struct nameidata anymore; just the flags.
 
	The witch is dead!  Well, 2/3 of it, anyway.  ->d_revalidate() and

->lookup() do *not* take struct nameidata anymore; just the flags.

Documentation/filesystems/vfs.txt

+1 −1
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ filesystem. As of kernel 2.6.22, the following members are defined: 


struct inode_operations {

	int (*create) (struct inode *,struct dentry *, umode_t, struct nameidata *);

	struct dentry * (*lookup) (struct inode *,struct dentry *, struct nameidata *);

	struct dentry * (*lookup) (struct inode *,struct dentry *, unsigned int);

	int (*link) (struct dentry *,struct inode *,struct dentry *);

	int (*unlink) (struct inode *,struct dentry *);

	int (*symlink) (struct inode *,struct dentry *,const char *);

fs/9p/v9fs.h

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ extern void v9fs_session_close(struct v9fs_session_info *v9ses); 
extern void v9fs_session_cancel(struct v9fs_session_info *v9ses);

extern void v9fs_session_begin_cancel(struct v9fs_session_info *v9ses);

extern struct dentry *v9fs_vfs_lookup(struct inode *dir, struct dentry *dentry,

			struct nameidata *nameidata);

			unsigned int flags);

extern int v9fs_vfs_unlink(struct inode *i, struct dentry *d);

extern int v9fs_vfs_rmdir(struct inode *i, struct dentry *d);

extern int v9fs_vfs_rename(struct inode *old_dir, struct dentry *old_dentry,

fs/9p/vfs_inode.c

+4 −4
Original line number Diff line number Diff line
@@ -785,7 +785,7 @@ static int v9fs_vfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode 
 */



struct dentry *v9fs_vfs_lookup(struct inode *dir, struct dentry *dentry,

				      struct nameidata *nameidata)

				      unsigned int flags)

{

	struct dentry *res;

	struct super_block *sb;
@@ -795,8 +795,8 @@ struct dentry *v9fs_vfs_lookup(struct inode *dir, struct dentry *dentry, 
	char *name;

	int result = 0;



	p9_debug(P9_DEBUG_VFS, "dir: %p dentry: (%s) %p nameidata: %p\n",

		 dir, dentry->d_name.name, dentry, nameidata);

	p9_debug(P9_DEBUG_VFS, "dir: %p dentry: (%s) %p flags: %x\n",

		 dir, dentry->d_name.name, dentry, flags);



	if (dentry->d_name.len > NAME_MAX)

		return ERR_PTR(-ENAMETOOLONG);
@@ -869,7 +869,7 @@ v9fs_vfs_atomic_open(struct inode *dir, struct dentry *dentry, 
	struct dentry *res = NULL;



	if (d_unhashed(dentry)) {

		res = v9fs_vfs_lookup(dir, dentry, NULL);

		res = v9fs_vfs_lookup(dir, dentry, 0);

		if (IS_ERR(res))

			return PTR_ERR(res);