diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-11 17:08:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-11 17:08:11 -0700 |
| commit | d668e848293fb57826771a0375a97a6cd1970a63 (patch) | |
| tree | 8b03fba2dcc4b380432154e790afb2d348349267 /fs/orangefs/orangefs-mod.c | |
| parent | 57d528bfe7d7279d7e91a9bd9803837835c09b5c (diff) | |
| parent | e848643b524be9c10826c2cf36eebb74eef643d2 (diff) | |
| download | kernel_replicant_linux-d668e848293fb57826771a0375a97a6cd1970a63.tar.gz kernel_replicant_linux-d668e848293fb57826771a0375a97a6cd1970a63.tar.bz2 kernel_replicant_linux-d668e848293fb57826771a0375a97a6cd1970a63.zip | |
Merge tag 'for-linus-5.9-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux
Pull orangefs updates from Mike Marshall:
"A fix and a cleanup...
The fix: Al Viro pointed out that I had broken some acl functionality
with one of my previous patches.
And the cleanup: Jing Xiangfeng found and removed a needless variable
assignment"
* tag 'for-linus-5.9-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux:
orangefs: remove unnecessary assignment to variable ret
orangefs: posix acl fix...
Diffstat (limited to 'fs/orangefs/orangefs-mod.c')
| -rw-r--r-- | fs/orangefs/orangefs-mod.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/orangefs/orangefs-mod.c b/fs/orangefs/orangefs-mod.c index 289b648ae196..74a3d6337ef4 100644 --- a/fs/orangefs/orangefs-mod.c +++ b/fs/orangefs/orangefs-mod.c @@ -149,7 +149,6 @@ static int __init orangefs_init(void) pr_info("%s: module version %s loaded\n", __func__, ORANGEFS_VERSION); - ret = 0; goto out; } |