summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2010-09-20 16:01:30 -0700
committerSteve French <sfrench@us.ibm.com>2010-09-29 19:04:31 +0000
commit5fe97cfddc426f3145e8673b68faab7e54462173 (patch)
tree8ef6646ef8237c2757ecb8333a09899c946e4b86
parent736a33205969c16f81d747db14ff4c0f133609a6 (diff)
downloadlinux-5fe97cfddc426f3145e8673b68faab7e54462173.tar.gz
linux-5fe97cfddc426f3145e8673b68faab7e54462173.tar.bz2
linux-5fe97cfddc426f3145e8673b68faab7e54462173.zip
cifs: add tcon field to cifsFileInfo struct
Eventually, we'll have more than one tcon per superblock. At that point, we'll need to know which one is associated with a particular fid. For now, this is just set from the cifs_sb->tcon pointer, but eventually the caller of cifs_new_fileinfo will pass a tcon pointer in. Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Steve French <sfrench@us.ibm.com>
-rw-r--r--fs/cifs/cifsglob.h1
-rw-r--r--fs/cifs/dir.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index 6ef0efaf68d4..6f3968a5fea4 100644
--- a/fs/cifs/cifsglob.h
+++ b/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/fs/cifs/dir.c b/fs/cifs/dir.c
index 0f947bf73f8e..613589cf5172 100644
--- a/fs/cifs/dir.c
+++ b/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);