diff options
| author | Jeff Layton <jlayton@redhat.com> | 2011-07-26 18:20:17 +0200 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2011-07-31 23:21:20 +0200 |
| commit | ad635942c869ad8fc9af270d4998c42b4e978b32 (patch) | |
| tree | b199a039df4aacd26224302b7c29193171e4d444 /fs/cifs/cifsfs.h | |
| parent | cifs: fix compiler warning in CIFSSMBQAllEAs (diff) | |
| download | linux-ad635942c869ad8fc9af270d4998c42b4e978b32.tar.xz linux-ad635942c869ad8fc9af270d4998c42b4e978b32.zip | |
cifs: simplify refcounting for oplock breaks
Currently, we take a sb->s_active reference and a cifsFileInfo reference
when an oplock break workqueue job is queued. This is unnecessary and
more complicated than it needs to be. Also as Al points out,
deactivate_super has non-trivial locking implications so it's best to
avoid that if we can.
Instead, just cancel any pending oplock breaks for this filehandle
synchronously in cifsFileInfo_put after taking it off the lists.
That should ensure that this job doesn't outlive the structures it
depends on.
Reported-by: Al Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/cifsfs.h')
| -rw-r--r-- | fs/cifs/cifsfs.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h index fbd050c8d52a..cb71dc1f94d1 100644 --- a/fs/cifs/cifsfs.h +++ b/fs/cifs/cifsfs.h @@ -41,10 +41,6 @@ extern struct file_system_type cifs_fs_type; extern const struct address_space_operations cifs_addr_ops; extern const struct address_space_operations cifs_addr_ops_smallbuf; -/* Functions related to super block operations */ -extern void cifs_sb_active(struct super_block *sb); -extern void cifs_sb_deactive(struct super_block *sb); - /* Functions related to inodes */ extern const struct inode_operations cifs_dir_inode_ops; extern struct inode *cifs_root_iget(struct super_block *); |