diff options
author | Jeff Layton <jlayton@redhat.com> | 2010-09-20 19:01:30 -0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2010-09-29 15:04:31 -0400 |
commit | 5fe97cfddc426f3145e8673b68faab7e54462173 (patch) | |
tree | 8ef6646ef8237c2757ecb8333a09899c946e4b86 /fs | |
parent | 736a33205969c16f81d747db14ff4c0f133609a6 (diff) |
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>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/cifs/cifsglob.h | 1 | ||||
-rw-r--r-- | fs/cifs/dir.c | 1 |
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 { | |||
351 | struct file *pfile; /* needed for writepage */ | 351 | struct file *pfile; /* needed for writepage */ |
352 | struct inode *pInode; /* needed for oplock break */ | 352 | struct inode *pInode; /* needed for oplock break */ |
353 | struct vfsmount *mnt; | 353 | struct vfsmount *mnt; |
354 | struct cifsTconInfo *tcon; | ||
354 | struct mutex lock_mutex; | 355 | struct mutex lock_mutex; |
355 | struct list_head llist; /* list of byte range locks we have. */ | 356 | struct list_head llist; /* list of byte range locks we have. */ |
356 | bool closePend:1; /* file is marked to close */ | 357 | 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, | |||
150 | pCifsFile->pfile = file; | 150 | pCifsFile->pfile = file; |
151 | pCifsFile->invalidHandle = false; | 151 | pCifsFile->invalidHandle = false; |
152 | pCifsFile->closePend = false; | 152 | pCifsFile->closePend = false; |
153 | pCifsFile->tcon = cifs_sb->tcon; | ||
153 | mutex_init(&pCifsFile->fh_mutex); | 154 | mutex_init(&pCifsFile->fh_mutex); |
154 | mutex_init(&pCifsFile->lock_mutex); | 155 | mutex_init(&pCifsFile->lock_mutex); |
155 | INIT_LIST_HEAD(&pCifsFile->llist); | 156 | INIT_LIST_HEAD(&pCifsFile->llist); |