diff options
author | Pavel Shilovsky <piastry@etersoft.ru> | 2011-09-22 09:53:59 +0400 |
---|---|---|
committer | Steve French <smfrench@gmail.com> | 2011-10-13 19:52:47 -0500 |
commit | d59dad2be038132259ac99a2837d65a87fd90588 (patch) | |
tree | ba31d82b208981c6779a071217ff762cd3a1777e /fs/cifs/file.c | |
parent | fe11e4ccb8479d92cd2a101d380d332544b84aaa (diff) | |
download | linux-d59dad2be038132259ac99a2837d65a87fd90588.tar.bz2 |
CIFS: Move byte range lock list from fd to inode
that let us do local lock checks before requesting to the server.
Signed-off-by: Pavel Shilovsky <piastry@etersoft.ru>
Signed-off-by: Steve French <smfrench@gmail.com>
Diffstat (limited to 'fs/cifs/file.c')
-rw-r--r-- | fs/cifs/file.c | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index ab85699c5653..7f84ece116d0 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -262,8 +262,6 @@ cifs_new_fileinfo(__u16 fileHandle, struct file *file, pCifsFile->invalidHandle = false; pCifsFile->tlink = cifs_get_tlink(tlink); mutex_init(&pCifsFile->fh_mutex); - mutex_init(&pCifsFile->lock_mutex); - INIT_LIST_HEAD(&pCifsFile->llist); INIT_WORK(&pCifsFile->oplock_break, cifs_oplock_break); spin_lock(&cifs_file_list_lock); @@ -331,12 +329,14 @@ void cifsFileInfo_put(struct cifsFileInfo *cifs_file) /* Delete any outstanding lock records. We'll lose them when the file * is closed anyway. */ - mutex_lock(&cifs_file->lock_mutex); - list_for_each_entry_safe(li, tmp, &cifs_file->llist, llist) { + mutex_lock(&cifsi->lock_mutex); + list_for_each_entry_safe(li, tmp, &cifsi->llist, llist) { + if (li->netfid != cifs_file->netfid) + continue; list_del(&li->llist); kfree(li); } - mutex_unlock(&cifs_file->lock_mutex); + mutex_unlock(&cifsi->lock_mutex); cifs_put_tlink(cifs_file->tlink); dput(cifs_file->dentry); @@ -639,20 +639,21 @@ int cifs_closedir(struct inode *inode, struct file *file) return rc; } -static int store_file_lock(struct cifsFileInfo *cfile, __u64 len, +static int store_file_lock(struct cifsInodeInfo *cinode, __u64 len, __u64 offset, __u8 type, __u16 netfid) { struct cifsLockInfo *li = kmalloc(sizeof(struct cifsLockInfo), GFP_KERNEL); if (li == NULL) return -ENOMEM; + li->netfid = netfid; li->offset = offset; li->length = len; li->type = type; li->pid = current->tgid; - mutex_lock(&cfile->lock_mutex); - list_add_tail(&li->llist, &cfile->llist); - mutex_unlock(&cfile->lock_mutex); + mutex_lock(&cinode->lock_mutex); + list_add_tail(&li->llist, &cinode->llist); + mutex_unlock(&cinode->lock_mutex); return 0; } @@ -769,6 +770,7 @@ cifs_setlk(struct file *file, struct file_lock *flock, __u8 type, __u64 length = 1 + flock->fl_end - flock->fl_start; struct cifsFileInfo *cfile = (struct cifsFileInfo *)file->private_data; struct cifs_tcon *tcon = tlink_tcon(cfile->tlink); + struct cifsInodeInfo *cinode = CIFS_I(file->f_path.dentry->d_inode); __u16 netfid = cfile->netfid; if (posix_lck) { @@ -791,7 +793,7 @@ cifs_setlk(struct file *file, struct file_lock *flock, __u8 type, flock->fl_start, 0, lock, type, wait_flag, 0); if (rc == 0) { /* For Windows locks we must store them. */ - rc = store_file_lock(cfile, length, flock->fl_start, + rc = store_file_lock(cinode, length, flock->fl_start, type, netfid); } } else if (unlock) { @@ -802,14 +804,16 @@ cifs_setlk(struct file *file, struct file_lock *flock, __u8 type, int stored_rc = 0; struct cifsLockInfo *li, *tmp; - mutex_lock(&cfile->lock_mutex); - list_for_each_entry_safe(li, tmp, &cfile->llist, llist) { + mutex_lock(&cinode->lock_mutex); + list_for_each_entry_safe(li, tmp, &cinode->llist, llist) { if (flock->fl_start > li->offset || (flock->fl_start + length) < (li->offset + li->length)) continue; if (current->tgid != li->pid) continue; + if (cfile->netfid != li->netfid) + continue; stored_rc = CIFSSMBLock(xid, tcon, netfid, current->tgid, li->length, @@ -822,7 +826,7 @@ cifs_setlk(struct file *file, struct file_lock *flock, __u8 type, kfree(li); } } - mutex_unlock(&cfile->lock_mutex); + mutex_unlock(&cinode->lock_mutex); } out: if (flock->fl_flags & FL_POSIX) |