diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-06 02:44:36 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-06 02:44:36 +0300 |
| commit | aaa2faab4ed8e5fe0111e04d6e168c028fe2987f (patch) | |
| tree | 0227c276a98c907bfc77b53235aa2988135bb868 /fs/orangefs/orangefs-mod.c | |
| parent | e3cea0cad147a9ab4f0e74a2fbdf15d18df1f820 (diff) | |
| parent | 0df556457748d160013e88202c11712c16a83b0c (diff) | |
| download | linux-aaa2faab4ed8e5fe0111e04d6e168c028fe2987f.tar.xz | |
Merge tag 'for-linus-5.8-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux
Pull orangefs updates from Mike Marshall:
- John Hubbard's conversion from get_user_pages() to pin_user_pages()
- Colin Ian King's removal of an unneeded variable initialization
* tag 'for-linus-5.8-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux:
orangefs: convert get_user_pages() --> pin_user_pages()
orangefs: remove redundant assignment to variable ret
Diffstat (limited to 'fs/orangefs/orangefs-mod.c')
| -rw-r--r-- | fs/orangefs/orangefs-mod.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/orangefs/orangefs-mod.c b/fs/orangefs/orangefs-mod.c index c010c1fddafc..289b648ae196 100644 --- a/fs/orangefs/orangefs-mod.c +++ b/fs/orangefs/orangefs-mod.c @@ -79,7 +79,7 @@ DECLARE_WAIT_QUEUE_HEAD(orangefs_request_list_waitq); static int __init orangefs_init(void) { - int ret = -1; + int ret; __u32 i = 0; if (op_timeout_secs < 0) |