diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-06-10 17:13:09 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-07-14 08:34:32 -0400 |
commit | 00cd8dd3bf95f2cc8435b4cac01d9995635c6d0b (patch) | |
tree | d44be476ced0317ae79f28853734ebe2210ad38e /fs/cifs | |
parent | 201f956e43d4542723514e024d948011dd766d43 (diff) |
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: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/cifs')
-rw-r--r-- | fs/cifs/cifsfs.h | 2 | ||||
-rw-r--r-- | fs/cifs/dir.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h index 48bb474ce294..1abd31fd5bf0 100644 --- a/fs/cifs/cifsfs.h +++ b/fs/cifs/cifsfs.h | |||
@@ -50,7 +50,7 @@ extern int cifs_atomic_open(struct inode *, struct dentry *, | |||
50 | struct file *, unsigned, umode_t, | 50 | struct file *, unsigned, umode_t, |
51 | int *); | 51 | int *); |
52 | extern struct dentry *cifs_lookup(struct inode *, struct dentry *, | 52 | extern struct dentry *cifs_lookup(struct inode *, struct dentry *, |
53 | struct nameidata *); | 53 | unsigned int); |
54 | extern int cifs_unlink(struct inode *dir, struct dentry *dentry); | 54 | extern int cifs_unlink(struct inode *dir, struct dentry *dentry); |
55 | extern int cifs_hardlink(struct dentry *, struct inode *, struct dentry *); | 55 | extern int cifs_hardlink(struct dentry *, struct inode *, struct dentry *); |
56 | extern int cifs_mknod(struct inode *, struct dentry *, umode_t, dev_t); | 56 | extern int cifs_mknod(struct inode *, struct dentry *, umode_t, dev_t); |
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c index b97ff48b7df6..2d732b9276ee 100644 --- a/fs/cifs/dir.c +++ b/fs/cifs/dir.c | |||
@@ -401,7 +401,7 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry, | |||
401 | * in network traffic in the other paths. | 401 | * in network traffic in the other paths. |
402 | */ | 402 | */ |
403 | if (!(oflags & O_CREAT)) { | 403 | if (!(oflags & O_CREAT)) { |
404 | struct dentry *res = cifs_lookup(inode, direntry, NULL); | 404 | struct dentry *res = cifs_lookup(inode, direntry, 0); |
405 | if (IS_ERR(res)) | 405 | if (IS_ERR(res)) |
406 | return PTR_ERR(res); | 406 | return PTR_ERR(res); |
407 | 407 | ||
@@ -621,7 +621,7 @@ mknod_out: | |||
621 | 621 | ||
622 | struct dentry * | 622 | struct dentry * |
623 | cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry, | 623 | cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry, |
624 | struct nameidata *nd) | 624 | unsigned int flags) |
625 | { | 625 | { |
626 | int xid; | 626 | int xid; |
627 | int rc = 0; /* to get around spurious gcc warning, set to zero here */ | 627 | int rc = 0; /* to get around spurious gcc warning, set to zero here */ |