diff options
| author | David S. Miller <davem@davemloft.net> | 2014-08-23 11:12:08 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-08-23 11:12:08 -0700 |
| commit | f9474ddfaa009ead12bba44fa8fd49dc4536a124 (patch) | |
| tree | a1738a74ac909d84cc80af674d7c0b78af10a413 /fs/cifs/misc.c | |
| parent | 989e04c5bc3ff77d65e1f0d87bf7904dfa30d41c (diff) | |
| parent | a45e92a599e77ee6a850eabdd0141633fde03915 (diff) | |
| download | linux-f9474ddfaa009ead12bba44fa8fd49dc4536a124.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pulling to get some TIPC fixes that a net-next series depends
upon.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/cifs/misc.c')
| -rw-r--r-- | fs/cifs/misc.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c index 81340c6253eb..b7415d596dbd 100644 --- a/fs/cifs/misc.c +++ b/fs/cifs/misc.c @@ -574,13 +574,6 @@ void cifs_set_oplock_level(struct cifsInodeInfo *cinode, __u32 oplock) cinode->oplock = 0; } -static int -cifs_oplock_break_wait(void *unused) -{ - schedule(); - return signal_pending(current) ? -ERESTARTSYS : 0; -} - /* * We wait for oplock breaks to be processed before we attempt to perform * writes. |