diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-07-11 18:30:34 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-07-11 18:30:34 +0000 |
| commit | 7521a3c566dda7bb09576975324fc0a08a79ad14 (patch) | |
| tree | 2ba0405ea1a7f3f187c2434ef86000b1b65f2d01 /fs/cifs/cifsfs.c | |
| parent | fb8c4b14d9259ba467241a7aaeb712caedce7ee8 (diff) | |
| download | linux-7521a3c566dda7bb09576975324fc0a08a79ad14.tar.gz linux-7521a3c566dda7bb09576975324fc0a08a79ad14.tar.bz2 linux-7521a3c566dda7bb09576975324fc0a08a79ad14.zip | |
[CIFS] Fix oops in cifs_create when nfsd server exports cifs mount
nfsd is passing null nameidata (probably the only one doing that)
on call to create - cifs was missing one check for this.
Note that running nfsd over a cifs mount requires specifying fsid on
the nfs exports entry and requires mounting cifs with serverino mount
option.
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/cifsfs.c')
| -rw-r--r-- | fs/cifs/cifsfs.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index 17ed7cf750af..40f35f0263ac 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@ -114,10 +114,6 @@ cifs_read_super(struct super_block *sb, void *data, sb->s_magic = CIFS_MAGIC_NUMBER; sb->s_op = &cifs_super_ops; -#ifdef CONFIG_CIFS_EXPERIMENTAL - if (experimEnabled != 0) - sb->s_export_op = &cifs_export_ops; -#endif /* EXPERIMENTAL */ /* if (cifs_sb->tcon->ses->server->maxBuf > MAX_CIFS_HDR_SIZE + 512) sb->s_blocksize = cifs_sb->tcon->ses->server->maxBuf - MAX_CIFS_HDR_SIZE; */ @@ -139,6 +135,13 @@ cifs_read_super(struct super_block *sb, void *data, rc = -ENOMEM; goto out_no_root; } + +#ifdef CONFIG_CIFS_EXPERIMENTAL + if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM) { + cFYI(1, ("export ops supported")); + sb->s_export_op = &cifs_export_ops; + } +#endif /* EXPERIMENTAL */ return 0; |