diff options
author | Jeff Layton <jlayton@redhat.com> | 2012-09-19 09:22:42 -0400 |
---|---|---|
committer | Steve French <smfrench@gmail.com> | 2012-09-24 22:46:32 -0400 |
commit | 71953fc6e4ce5ac05b594d8e5866accf531aa969 (patch) | |
tree | 3c26e6418eeac94c542ea1d29153f8dc6db3a006 /fs/cifs/cifsglob.h | |
parent | 5819575ec6b82345e1a21a960d381c699a91c700 (diff) |
cifs: remove kmap lock and rsize limit
Now that we aren't abusing the kmap address space, there's no need for
this lock or to impose a limit on the rsize.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Diffstat (limited to 'fs/cifs/cifsglob.h')
-rw-r--r-- | fs/cifs/cifsglob.h | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index 79e8b6f06021..b2bb941d8ddd 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h | |||
@@ -638,45 +638,6 @@ get_next_mid(struct TCP_Server_Info *server) | |||
638 | #define CIFS_DEFAULT_NON_POSIX_WSIZE (65536) | 638 | #define CIFS_DEFAULT_NON_POSIX_WSIZE (65536) |
639 | 639 | ||
640 | /* | 640 | /* |
641 | * On hosts with high memory, we can't currently support wsize/rsize that are | ||
642 | * larger than we can kmap at once. Cap the rsize/wsize at | ||
643 | * LAST_PKMAP * PAGE_SIZE. We'll never be able to fill a read or write request | ||
644 | * larger than that anyway. | ||
645 | */ | ||
646 | #ifdef CONFIG_HIGHMEM | ||
647 | #define CIFS_KMAP_SIZE_LIMIT (LAST_PKMAP * PAGE_CACHE_SIZE) | ||
648 | #else /* CONFIG_HIGHMEM */ | ||
649 | #define CIFS_KMAP_SIZE_LIMIT (1<<24) | ||
650 | #endif /* CONFIG_HIGHMEM */ | ||
651 | |||
652 | #ifdef CONFIG_HIGHMEM | ||
653 | /* | ||
654 | * On arches that have high memory, kmap address space is limited. By | ||
655 | * serializing the kmap operations on those arches, we ensure that we don't | ||
656 | * end up with a bunch of threads in writeback with partially mapped page | ||
657 | * arrays, stuck waiting for kmap to come back. That situation prevents | ||
658 | * progress and can deadlock. | ||
659 | */ | ||
660 | |||
661 | extern struct mutex cifs_kmap_mutex; | ||
662 | |||
663 | static inline void | ||
664 | cifs_kmap_lock(void) | ||
665 | { | ||
666 | mutex_lock(&cifs_kmap_mutex); | ||
667 | } | ||
668 | |||
669 | static inline void | ||
670 | cifs_kmap_unlock(void) | ||
671 | { | ||
672 | mutex_unlock(&cifs_kmap_mutex); | ||
673 | } | ||
674 | #else /* !CONFIG_HIGHMEM */ | ||
675 | #define cifs_kmap_lock() do { ; } while (0) | ||
676 | #define cifs_kmap_unlock() do { ; } while (0) | ||
677 | #endif /* CONFIG_HIGHMEM */ | ||
678 | |||
679 | /* | ||
680 | * Macros to allow the TCP_Server_Info->net field and related code to drop out | 641 | * Macros to allow the TCP_Server_Info->net field and related code to drop out |
681 | * when CONFIG_NET_NS isn't set. | 642 | * when CONFIG_NET_NS isn't set. |
682 | */ | 643 | */ |