diff options
| author | Steve French <sfrench@us.ibm.com> | 2009-06-26 03:25:49 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-06-26 03:25:49 +0000 |
| commit | ad8034f19792736db5c259103c2eaaf72887bbb4 (patch) | |
| tree | ad631c38d2d66c6d3ca57cdae471560461cec119 /fs/cifs | |
| parent | 0f3bc09ee1b7fcadd5bfdc5ed2e1643f658fe23d (diff) | |
| download | kernel_samsung_crespo-ad8034f19792736db5c259103c2eaaf72887bbb4.zip kernel_samsung_crespo-ad8034f19792736db5c259103c2eaaf72887bbb4.tar.gz kernel_samsung_crespo-ad8034f19792736db5c259103c2eaaf72887bbb4.tar.bz2 | |
[CIFS] remove bkl usage from umount begin
The lock_kernel call moved into the fs for umount_begin
is not needed. This adds a check to make sure we don't
call umount_begin twice on the same fs.
umount_begin for cifs is probably not needed and
may eventually be able to be removed, but in
the meantime this smaller patch is safe and
gets rid of the bkl from this path which provides
some benefit.
Acked-by: Jeff Layton <redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs')
| -rw-r--r-- | fs/cifs/cifsfs.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index b5e9f39..9f669f9 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@ -537,9 +537,14 @@ static void cifs_umount_begin(struct super_block *sb) if (tcon == NULL) return; - lock_kernel(); read_lock(&cifs_tcp_ses_lock); - if (tcon->tc_count == 1) + if ((tcon->tc_count > 1) || (tcon->tidStatus == CifsExiting)) { + /* we have other mounts to same share or we have + already tried to force umount this and woken up + all waiting network requests, nothing to do */ + read_unlock(&cifs_tcp_ses_lock); + return; + } else if (tcon->tc_count == 1) tcon->tidStatus = CifsExiting; read_unlock(&cifs_tcp_ses_lock); @@ -554,9 +559,7 @@ static void cifs_umount_begin(struct super_block *sb) wake_up_all(&tcon->ses->server->response_q); msleep(1); } -/* BB FIXME - finish add checks for tidStatus BB */ - unlock_kernel(); return; } |