From 7e72740d67d968e8f9dd71c4f6639cc7323f8609 Mon Sep 17 00:00:00 2001 From: Jeff Layton Date: Mon, 20 Sep 2010 16:01:30 -0700 Subject: [PATCH] --- yaml --- r: 213400 b: refs/heads/master c: 5fe97cfddc426f3145e8673b68faab7e54462173 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/cifs/cifsglob.h | 1 + trunk/fs/cifs/dir.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index bd7a35e5e6a5..556dbe96a004 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 736a33205969c16f81d747db14ff4c0f133609a6 +refs/heads/master: 5fe97cfddc426f3145e8673b68faab7e54462173 diff --git a/trunk/fs/cifs/cifsglob.h b/trunk/fs/cifs/cifsglob.h index 6ef0efaf68d4..6f3968a5fea4 100644 --- a/trunk/fs/cifs/cifsglob.h +++ b/trunk/fs/cifs/cifsglob.h @@ -351,6 +351,7 @@ struct cifsFileInfo { struct file *pfile; /* needed for writepage */ struct inode *pInode; /* needed for oplock break */ struct vfsmount *mnt; + struct cifsTconInfo *tcon; struct mutex lock_mutex; struct list_head llist; /* list of byte range locks we have. */ bool closePend:1; /* file is marked to close */ diff --git a/trunk/fs/cifs/dir.c b/trunk/fs/cifs/dir.c index 0f947bf73f8e..613589cf5172 100644 --- a/trunk/fs/cifs/dir.c +++ b/trunk/fs/cifs/dir.c @@ -150,6 +150,7 @@ cifs_new_fileinfo(struct inode *newinode, __u16 fileHandle, pCifsFile->pfile = file; pCifsFile->invalidHandle = false; pCifsFile->closePend = false; + pCifsFile->tcon = cifs_sb->tcon; mutex_init(&pCifsFile->fh_mutex); mutex_init(&pCifsFile->lock_mutex); INIT_LIST_HEAD(&pCifsFile->llist);