Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: [CIFS] Enable mmap on forcedirectio mounts cifs: NULL out tcon, pSesInfo, and srvTcp pointers when chasing DFS referrals
This commit is contained in:
commit
c03f6bfc9f
3 changed files with 14 additions and 6 deletions
|
@ -5,7 +5,9 @@ have duplicated data). Fix oops in cifs_lookup. Workaround problem
|
|||
mounting to OS/400 Netserve. Fix oops in cifs_get_tcp_session.
|
||||
Disable use of server inode numbers when server only
|
||||
partially supports them (e.g. for one server querying inode numbers on
|
||||
FindFirst fails but QPathInfo queries works).
|
||||
FindFirst fails but QPathInfo queries works). Fix oops with dfs in
|
||||
cifs_put_smb_ses. Fix mmap to work on directio mounts (needed
|
||||
for OpenOffice when on forcedirectio mount e.g.)
|
||||
|
||||
Version 1.60
|
||||
-------------
|
||||
|
|
|
@ -758,7 +758,7 @@ const struct file_operations cifs_file_ops = {
|
|||
};
|
||||
|
||||
const struct file_operations cifs_file_direct_ops = {
|
||||
/* no mmap, no aio, no readv -
|
||||
/* no aio, no readv -
|
||||
BB reevaluate whether they can be done with directio, no cache */
|
||||
.read = cifs_user_read,
|
||||
.write = cifs_user_write,
|
||||
|
@ -767,6 +767,7 @@ const struct file_operations cifs_file_direct_ops = {
|
|||
.lock = cifs_lock,
|
||||
.fsync = cifs_fsync,
|
||||
.flush = cifs_flush,
|
||||
.mmap = cifs_file_mmap,
|
||||
.splice_read = generic_file_splice_read,
|
||||
#ifdef CONFIG_CIFS_POSIX
|
||||
.unlocked_ioctl = cifs_ioctl,
|
||||
|
|
|
@ -2287,12 +2287,12 @@ int
|
|||
cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb,
|
||||
char *mount_data_global, const char *devname)
|
||||
{
|
||||
int rc = 0;
|
||||
int rc;
|
||||
int xid;
|
||||
struct smb_vol *volume_info;
|
||||
struct cifsSesInfo *pSesInfo = NULL;
|
||||
struct cifsTconInfo *tcon = NULL;
|
||||
struct TCP_Server_Info *srvTcp = NULL;
|
||||
struct cifsSesInfo *pSesInfo;
|
||||
struct cifsTconInfo *tcon;
|
||||
struct TCP_Server_Info *srvTcp;
|
||||
char *full_path;
|
||||
char *mount_data = mount_data_global;
|
||||
#ifdef CONFIG_CIFS_DFS_UPCALL
|
||||
|
@ -2301,6 +2301,10 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb,
|
|||
int referral_walks_count = 0;
|
||||
try_mount_again:
|
||||
#endif
|
||||
rc = 0;
|
||||
tcon = NULL;
|
||||
pSesInfo = NULL;
|
||||
srvTcp = NULL;
|
||||
full_path = NULL;
|
||||
|
||||
xid = GetXid();
|
||||
|
@ -2597,6 +2601,7 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb,
|
|||
|
||||
cleanup_volume_info(&volume_info);
|
||||
referral_walks_count++;
|
||||
FreeXid(xid);
|
||||
goto try_mount_again;
|
||||
}
|
||||
#else /* No DFS support, return error on mount */
|
||||
|
|
Loading…
Reference in a new issue