summaryrefslogtreecommitdiffstats
path: root/fs/cifs/cifsproto.h
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2010-04-22 19:21:55 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2010-07-05 11:16:09 -0700
commit8c11d9038537657cc74fb8d2242fd18c3d6a05d5 (patch)
treeb2579189d21e44e25de4753006472b9fc0731c33 /fs/cifs/cifsproto.h
parentca12f650743dbfc723de02e37f1ac562a1978b33 (diff)
downloadkernel-crypto-8c11d9038537657cc74fb8d2242fd18c3d6a05d5.tar.gz
kernel-crypto-8c11d9038537657cc74fb8d2242fd18c3d6a05d5.tar.xz
kernel-crypto-8c11d9038537657cc74fb8d2242fd18c3d6a05d5.zip
CIFS: Allow null nd (as nfs server uses) on create
commit fa588e0c57048b3d4bfcd772d80dc0615f83fd35 upstream. While creating a file on a server which supports unix extensions such as Samba, if a file is being created which does not supply nameidata (i.e. nd is null), cifs client can oops when calling cifs_posix_open. Signed-off-by: Shirish Pargaonkar <shirishp@us.ibm.com> Signed-off-by: Steve French <sfrench@us.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs/cifs/cifsproto.h')
-rw-r--r--fs/cifs/cifsproto.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h
index 5646727e33f..05a9b776e1a 100644
--- a/fs/cifs/cifsproto.h
+++ b/fs/cifs/cifsproto.h
@@ -95,8 +95,10 @@ extern struct cifsFileInfo *cifs_new_fileinfo(struct inode *newinode,
__u16 fileHandle, struct file *file,
struct vfsmount *mnt, unsigned int oflags);
extern int cifs_posix_open(char *full_path, struct inode **pinode,
- struct vfsmount *mnt, int mode, int oflags,
- __u32 *poplock, __u16 *pnetfid, int xid);
+ struct vfsmount *mnt,
+ struct super_block *sb,
+ int mode, int oflags,
+ __u32 *poplock, __u16 *pnetfid, int xid);
extern void cifs_unix_basic_to_fattr(struct cifs_fattr *fattr,
FILE_UNIX_BASIC_INFO *info,
struct cifs_sb_info *cifs_sb);