Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Raidz rebase on upstream zfs-0.8-release #1

Closed
wants to merge 326 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
326 commits
Select commit Hold shift + click to select a range
1fd28bd
Add SCSI_PASSTHROUGH to zvols to enable UNMAP support
pcd1193182 Jun 21, 2019
7a5f465
Fix comments on zfs_bookmark_phys
pcd1193182 Jun 22, 2019
d053481
zstreamdump: add per-record-type counters and an overhead counter
allanjude Jun 22, 2019
95fcb04
Let zfs mount all tolerate in-progress mounts
Jun 22, 2019
2d88230
Add libnvpair to libzfs pkg-config
hjmallon Jun 22, 2019
be4a282
Remove arch and relax version dependency
gordan-bobic Jun 22, 2019
7d64595
dn_struct_rwlock can not be held in dmu_tx_try_assign()
ahrens Jun 22, 2019
cc7fe8a
Fix out-of-tree build failures
behlendorf Jun 24, 2019
bfe5f02
Fix error message on promoting encrypted dataset
Jun 24, 2019
05006f1
-Y option for zdb is valid
ikozhukhov Jun 25, 2019
04d4df8
Avoid extra taskq_dispatch() calls by DMU
amotin Jun 25, 2019
7d2489c
nopwrites on dmu_sync-ed blocks can result in a panic
grwilson Jun 28, 2019
093bb64
Don't use d_path() for automount mount point for chroot'd process
kusumi Jul 2, 2019
9e09826
Fix error text for EINVAL in zfs_receive_one()
Jul 3, 2019
7a03d7c
Check b_freeze_cksum under ZFS_DEBUG_MODIFY conditional
behlendorf Jul 3, 2019
14a11bf
Improve "Unable to automount" error message.
PaulZ-98 Jul 3, 2019
1f72a18
Remove VERIFY from dsl_dataset_crypt_stats()
Jul 5, 2019
2ac233c
Fix dracut Debian/Ubuntu packaging
loli10K Jul 9, 2019
ccd8125
Fix race in parallel mount's thread dispatching algorithm
kusumi Jul 9, 2019
c3a3c5a
pkg-utils python sitelib for SLES15
stancheff Jul 9, 2019
6e19cc7
Fix ZTS killed processes detection
AttilaFueloep Jul 10, 2019
cf966cb
Fixes: #8934 Large kmem_alloc
nmattis Jul 10, 2019
0a22324
Disable unused pathname::pn_path* (unneeded in Linux)
kusumi Jul 15, 2019
78831d4
Ensure dsl_destroy_head() decrypts objsets
Jul 15, 2019
d751b12
Export dnode symbols
behlendorf Jul 15, 2019
73e50a7
Drop redundant POSIX ACL check in zpl_init_acl()
kusumi Jul 15, 2019
af7a567
systemd encryption key support
aerusso Jun 2, 2019
446d08f
Fix get_special_prop() build failure
behlendorf Jul 16, 2019
984bfb3
Minor style cleanup
behlendorf Jul 17, 2019
2b9f73e
Use zfsctl_snapshot_hold() wrapper
kusumi Jul 17, 2019
ceb516a
Add missing __GFP_HIGHMEM flag to vmalloc
c0d3z3r0 Jul 17, 2019
4c98586
Fix lockdep recursive locking false positive in dbuf_destroy
jdike Jul 17, 2019
5456107
Linux 5.3 compat: rw_semaphore owner
behlendorf Jul 12, 2019
3982d95
Linux 5.3 compat: retire rw_tryupgrade()
behlendorf Jul 12, 2019
428a63c
Retire unused spl_{mutex,rwlock}_{init_fini}
behlendorf Jul 12, 2019
3c144b9
Fix wrong comment on zcr_blksz_{min,max}
kusumi Jul 18, 2019
bbbe4b0
hdr_recl calls zthr_wakeup() on destroyed zthr
sdimitro Jul 18, 2019
1c4b0fc
Race condition between spa async threads and export
sdimitro Jul 18, 2019
be068ae
Move some tests to cli_user/zpool_status
tonyhutter Jul 19, 2019
65a0b28
Fix module_param() type for zfs_read_chunk_size
kusumi Jul 19, 2019
4f951b1
Don't directly cast unsigned long to void*
kusumi Jul 25, 2019
1f5979d
zed crashes when devid not present
ahrens Jul 26, 2019
6c68594
Implement secpolicy_vnode_setid_retain()
kusumi Jul 26, 2019
a8c5bcb
Race between zfs-share and zfs-mount services
grwilson Jul 29, 2019
8c00159
Fix channel programs on s390x
behlendorf Jul 29, 2019
6c9882d
Improve performance by using dmu_tx_hold_*_by_dnode()
ahrens Jul 30, 2019
6d1599c
Increase default zcmd allocation to 256K
c0d3z3r0 Jul 30, 2019
569f5d5
Fix out-of-order ZIL txtype lost on hardlinked files
davidchenntnx Aug 14, 2019
65469f6
Linux 5.3 compat: Makefile subdir-m no longer supported
dspearson Aug 19, 2019
023ab67
Linux 5.3: Fix switch() fall though compiler errors
tonyhutter Aug 21, 2019
512a50f
zfs-mount-genrator: dependencies should be space-separated
yshui Aug 23, 2019
33374f2
Make slog test setup more robust
Aug 23, 2019
95319fc
Fix deadlock in 'zfs rollback'
Aug 27, 2019
ea34735
Fix Plymouth passphrase prompt in initramfs script
belperite Aug 27, 2019
931bef8
zfs_ioc_snapshot: check user-prop permissions on snapshotted datasets
avg-I Aug 27, 2019
c7a4255
Fix zil replay panic when TX_REMOVE followed by TX_CREATE
davidchenntnx Aug 28, 2019
0e765c4
zfs_handle used after being closed/freed in change_one callback
pzakha Aug 28, 2019
3cf4ecb
etc/init.d/zfs-functions.in: remove arch warning
gyakovlev Aug 29, 2019
13e5e39
Fix Intel QAT / ZFS compatibility on v4.7.1+ kernels
loli10K Sep 3, 2019
beb21db
Always refuse receving non-resume stream when resume state exists
avg-I Sep 3, 2019
3852847
New service that waits on zvol links to be created
pzakha Jul 17, 2019
5acba22
zvol_wait script should ignore partially received zvols
pzakha Sep 3, 2019
9f261b1
Fix zfs-dkms .deb package warning in prerm script
loli10K Sep 3, 2019
146d7d8
Fix zpool subcommands error message with some unsupported options
loli10K Sep 4, 2019
0ae5f0c
BuildRequires libtirpc-devel needed for RHEL 8
ofaaland Sep 6, 2019
97d4986
Fix /etc/hostid on root pool deadlock
behlendorf Sep 10, 2019
e17445d
kmodtool: depmod path
behlendorf Sep 11, 2019
9fa8b5b
QAT related bug fixes
cfzhux Sep 12, 2019
63d8f57
Scrubbing root pools may deadlock on kernels without elevator_change(…
loli10K Sep 14, 2019
12a78fb
Fix dsl_scan_ds_clone_swapped logic
avg-I Sep 18, 2019
c37fa0d
Disabled resilver_defer feature leads to looping resilvers
KodyKantor Sep 22, 2019
1222e92
Tag zfs-0.8.2
tonyhutter Aug 23, 2019
bee5738
make zil max block size tunable
ahrens Jun 10, 2019
8805abb
single-chunk scatter ABDs can be treated as linear
ahrens Jun 11, 2019
cbb9154
looping in metaslab_block_picker impacts performance on fragmented pools
ahrens Jun 13, 2019
e625030
OpenZFS 9425 - channel programs can be interrupted
Jun 22, 2019
d47ee5a
Fix bp_embedded_type enum definition
loli10K Jun 25, 2019
3506465
Concurrent small allocation defeats large allocation
pcd1193182 Jun 26, 2019
f3f46b0
OpenZFS 9318 - vol_volsize_to_reservation does not account for raidz …
Jun 30, 2019
66c8b2f
Don't activate metaslabs with weight 0
pcd1193182 Jul 5, 2019
cc8df1f
install path fixes
c0d3z3r0 Jul 30, 2019
1d4faef
Add channel program for property based snapshots
clinta Jul 30, 2019
77d59a6
lockdep false positive - move txg_kick() outside of ->dp_lock
jdike Jul 31, 2019
66398a4
Test cancelling a removal in ZTS
sdimitro Aug 5, 2019
376ca46
Don't wakeup unnecessarily in 'zpool events -f'
DeHackEd Aug 5, 2019
0b96952
Drop KMC_NOEMERGENCY
ryao Aug 13, 2019
d38e4ee
Change boolean-like uint8_t fields in znode_t to boolean_t
kusumi Aug 13, 2019
628fd31
spa_load_verify() may consume too much memory
grwilson Aug 13, 2019
5549a53
Fix device expansion when VM is powered off
Aug 14, 2019
93fd910
Prevent race in blkptr_verify against device removal
pcd1193182 Aug 14, 2019
9d4ca81
Make txg_wait_synced conditional in zfsvfs_teardown
PaulZ-98 Aug 15, 2019
dd6d0bd
Assert that a dnode's bonuslen never exceeds its recorded size
sdimitro Aug 15, 2019
b78d32c
Improve write performance by using dmu_read_by_dnode()
tonynguien Aug 15, 2019
dfa4d3d
dmu_tx_wait() hang likely due to cv_signal() in dsl_pool_dirty_delta()
sdimitro Aug 15, 2019
c75d396
initramfs: fixes for (debian) initramfs
c0d3z3r0 Aug 16, 2019
72dbc01
Add more refquota tests
pcd1193182 Aug 19, 2019
ed235de
Set "none" scheduler if available (initramfs)
colmbuckley Aug 19, 2019
db58aa7
Fix lockdep circular locking false positive involving sa_lock
jdike Aug 19, 2019
dcaa460
zfs-functions.in: in_mtab() always returns 1
fling- Aug 20, 2019
b7c9207
Minor cleanup in Makefile.am
Aug 21, 2019
b725485
ZTS: Fix vdev_zaps_005_pos on CentOS 6
behlendorf Aug 22, 2019
f64ef73
Enhance ioctl number checks
Aug 22, 2019
0189eb4
Dedup IOC enum values in libzfs_input_check
Aug 22, 2019
7ed41d2
Document ZFS_DKMS_ENABLE_DEBUGINFO in userland configuration
mfoliveira Aug 22, 2019
3b47c94
Fix install error introduced by #9089
pcd1193182 Aug 22, 2019
9ad6f69
ZTS: Fix in-tree dbufstats test case
behlendorf Aug 23, 2019
be6ae01
Split argument list, satisfy shellcheck SC2086
Aug 26, 2019
0c6ccc9
Add regression test for "zpool list -p"
pcd1193182 Aug 26, 2019
f785ce6
Prefer `for (;;)` to `while (TRUE)`
Aug 28, 2019
16f42e1
Use smaller default slack/delta value for schedule_hrtimeout_range()
tonynguien Aug 28, 2019
2f1f18a
Use compatible arg order in tests
Aug 29, 2019
0302546
Simplify deleting partitions in libtest
Aug 29, 2019
ebdb770
Prevent metaslab_sync panic due to spa_final_dirty_txg
pcd1193182 Aug 30, 2019
619fda5
Fix refquota_007_neg.ksh
ikozhukhov Aug 30, 2019
35c8730
Fix typos in config/
Gelma Aug 30, 2019
cac5f92
Fix typos in man/
Gelma Aug 30, 2019
eaf8e3b
Fix typos in cmd/
Gelma Aug 30, 2019
44ae857
Fix typos in contrib/
Gelma Aug 30, 2019
10e8abf
Fix typos in etc/
Gelma Aug 30, 2019
bcfa658
Fix typos in include/
Gelma Aug 30, 2019
8c01eb1
Fix typos in modules/icp/
Gelma Aug 30, 2019
48d8b24
Fix typos in module/
Gelma Aug 30, 2019
8e1f209
Fix typos in tests/
Gelma Aug 30, 2019
7572926
Fix typos in tests/
Gelma Aug 30, 2019
6673ef3
Fix typos in lib/
Gelma Sep 3, 2019
5097eb6
Fix typos in module/zfs/
Gelma Sep 3, 2019
500977e
Fix typos in tests/
Gelma Sep 3, 2019
d632608
Fix typos in tests/
Gelma Sep 3, 2019
f6a7018
Fix typos in tests/
Gelma Sep 3, 2019
7a7da11
Fix typos in tests/
Gelma Sep 3, 2019
36be89b
Fix typos in tests/
Gelma Sep 3, 2019
2af76a2
Fix typos in tests/
Gelma Sep 3, 2019
18d335d
Fix typos in tests/
Gelma Sep 3, 2019
4ff9026
Fix typos
Gelma Sep 3, 2019
7e93917
maxinflight can overflow in spa_load_verify_cb()
grwilson Sep 3, 2019
068c549
ZTS: Fix removal_cancel.ksh
ikozhukhov Sep 3, 2019
5cb46af
Fix panic on DilOS with kstat per dataset statistics
ikozhukhov Sep 3, 2019
8c9c049
Use the right booleans
Sep 3, 2019
27dda98
Refactor checksum operations in tests
Sep 5, 2019
cea5002
Clean up zfs_clone_010_pos
Sep 5, 2019
ffe29e7
Fix noop receive of raw send stream
Sep 5, 2019
4818563
Clean up do_vol_test in zfs_copies tests
Sep 9, 2019
43258fb
ZTS: Introduce targeted corruption in file blocks
jwk404 Sep 9, 2019
8747ee4
Fix stalled txg with repeated noop scans
Sep 11, 2019
088f97b
Canonicalize Python shebangs
Sep 12, 2019
5986c5c
Fix clone handling with encryption roots
Sep 16, 2019
b8bd3ec
ZTS: Fix /usr/bin/env: 'python2': No such file or directory
loli10K Sep 16, 2019
444df10
Device removal of indirect vdev panics the kernel
loli10K Sep 16, 2019
3ec97ba
Refactor libzfs_error_init newlines
Sep 18, 2019
8498a2f
Use signed types to prevent subtraction overflow
Sep 22, 2019
ec5d76e
diff_cb() does not handle large dnodes
loli10K Sep 24, 2019
055238d
Add warning for zfs_vdev_elevator option removal
behlendorf Sep 25, 2019
988b040
ZTS: harden xattr/cleanup.ksh
behlendorf Sep 25, 2019
62c034f
Linux 5.0 compat: SIMD compatibility
behlendorf Jul 12, 2019
35155c0
SIMD: Use alloc_pages_node to force alignment
Fabian-Gruenbichler Dec 10, 2019
ff3e2e3
Perform KABI checks in parallel
behlendorf Oct 1, 2019
0be4095
Fix for zfs-dracut regression
dacianstremtan Oct 1, 2019
5f67022
Workaround to avoid a race when /var/lib is a persistent dataset
didrocks Oct 2, 2019
05e2a4c
ZTS: Fix upgrade_readonly_pool
behlendorf Oct 3, 2019
b43893d
Rename rangelock_ functions to zfs_rangelock_
mattmacy Oct 3, 2019
5a1bf9e
Fix automount for root filesystems
behlendorf Oct 4, 2019
5e78137
ZTS: Fix trim/trim_config and trim/autotrim_config
behlendorf Oct 4, 2019
8139355
module/Makefile.in: don't run xargs if empty
gmelikov Oct 8, 2019
8af362c
ZTS: Fix mmp_hostid test
ikozhukhov Oct 8, 2019
90bc5ca
Update `zfs program` command usage
behlendorf Oct 10, 2019
f1ba547
Fix pool creation with feature@allocation_classes disabled
loli10K Oct 10, 2019
33cd5f2
Fix some style nits in tests
Oct 11, 2019
c99b304
Clarify loop variable name in zfs copies test
Oct 11, 2019
e416b16
Implement ZPOOL_IMPORT_UDEV_TIMEOUT_MS
ryao Oct 9, 2019
c54ee4c
ZTS: Fix zpool_status_-s
behlendorf Oct 11, 2019
e08b98e
Modify sharenfs=on default behavior
behlendorf Oct 14, 2019
8c8f844
Update skc_obj_alloc for spl kmem caches that are backed by Linux
sdimitro Oct 18, 2019
c19a651
Name anonymous enum of KMC_BIT constants
sdimitro Oct 18, 2019
601dd2a
ZTS: Written props test fails with 4k disks
jwk404 Oct 18, 2019
09015c2
Use correct format string when printing int8
mattmacy Oct 21, 2019
635bf1c
ZTS: Consistency pass for .ksh extensions
Oct 24, 2019
635603a
Fix incremental recursive encrypted receive
Oct 24, 2019
c6eaa8b
Fix zpool history unbounded memory usage
davidchenntnx Oct 28, 2019
7e1b772
Fix 'zfs change-key' with unencrypted child
Oct 30, 2019
123aa2f
Fix contrib/zcp/Makefile.am
behlendorf Oct 30, 2019
5187a14
dracut/zfs-load-key.sh: properly remove prefixes
alaviss Oct 30, 2019
ca0f9b7
Include prototypes for vdev_initialize
mattmacy Oct 31, 2019
1253fcc
Add a notice in /etc/defaults/zfs for systemd users
cdluminate Nov 6, 2019
618206c
Skip loading already loaded key
vozhyk- Nov 8, 2019
edaec84
Improve logging of 128KB writes
amotin Nov 11, 2019
2c7549f
Fix `zpool create -o <property>` error message
behlendorf Nov 13, 2019
1545f7c
Add missing documentation for some KMC flags
c0d3z3r0 Jul 21, 2019
880a37a
Prevent NULL pointer dereference in blkg_tryget() on EL8 kernels
loli10K Nov 13, 2019
6657800
Change zed.service to zfs-zed.service in man page
Nov 13, 2019
ef0b539
Remove inappropiate error message suggesting to use '-r'
InsanePrawn Nov 15, 2019
20e124d
Break out of zfs_zget early if unlinked znode
hrasiq Nov 15, 2019
7191f04
Remove requirement for -d 1 for zfs list and zfs get with bookmarks
InsanePrawn Nov 19, 2019
e688774
ZTS: Casenorm fix unicode interpretation
gmelikov Nov 20, 2019
6fed191
ZTS: tst.terminate_by_signal increase test threshold
behlendorf Nov 21, 2019
bc21c56
Check for unlinked znodes after igrab()
mfoliveira Nov 21, 2019
c9ac5ec
Add display of checksums to zdb -R
PaulZ-98 Nov 27, 2019
36fe630
Remove zfs_vdev_elevator module option
behlendorf Nov 27, 2019
48be45c
Implement -A (ignore ASSERTs) for zdb
PaulZ-98 Nov 27, 2019
922244c
Fix small typo in systemd mount generator
InsanePrawn Nov 22, 2019
19ea83c
Fix non-absolute path in systemd mount generator
InsanePrawn Nov 23, 2019
e740559
Fix encryption logic in systemd mount generator
InsanePrawn Nov 22, 2019
85204e3
Adapt gitignore for modules
c0d3z3r0 Dec 2, 2019
9cf46dd
Increase allowed 'special_small_blocks' maximum value
behlendorf Dec 3, 2019
388ef04
Fix use-after-free in case of L2ARC prefetch failure
amotin Dec 3, 2019
73b5231
Fix zdb_read_block using zio after it is destroyed
PaulZ-98 Dec 3, 2019
ba8a5a8
Fix reporting of L2ARC hits/misses in arc_summary3
gamanakis Dec 4, 2019
85ff6a2
Set send_realloc_files.ksh to use properties.shlib
Dec 6, 2019
2525b71
ZTS: Fix zpool_reopen_001_pos
behlendorf Dec 9, 2019
d2233a0
Exclude data from cores unconditionally and metadata conditionally
mattmacy Dec 9, 2019
4d658bd
zio_decompress_data always ASSERTs successful decompression
PaulZ-98 Dec 10, 2019
856d185
Fix use-after-free of vd_path in spa_vdev_remove()
ahrens Dec 11, 2019
7ad0ae9
Allow empty ds_props_obj to be destroyed
Dec 13, 2019
6455859
Don't fail to apply umask for O_TMPFILE files
kusumi Dec 13, 2019
0f25617
initramfs: setup keymapping and video for prompts
rlaager Dec 17, 2019
fb24456
Force systems with kernel option "quiet" to display prompt for password
ghfields Dec 18, 2019
7f7c15c
Create symbolic links in /dev/disk/by-vdev for nvme disk devices
geppi Dec 18, 2019
78072b7
Exchanged two "${ZFS} get -H -o value" commands
ghfields Dec 18, 2019
bf01567
cppcheck: (error) Uninitialized variable
Dec 13, 2019
363d733
cppcheck: (error) Uninitialized variable
Dec 14, 2019
603ae6a
cppcheck: (error) Shifting signed 64-bit value by 63 bits
Dec 14, 2019
1074834
cppcheck: (error) Memory leak: vtoc
behlendorf Dec 16, 2019
d01290f
cppcheck: (warning) Possible null pointer dereference: dnp
behlendorf Dec 16, 2019
1c27877
cppcheck: (error) Null pointer dereference: who_perm
behlendorf Dec 16, 2019
180c41e
cppcheck: (error) Address of local auto-variable assigned
behlendorf Dec 16, 2019
9791683
cppcheck: (warning) Possible null pointer dereference: nvh
behlendorf Dec 17, 2019
e05c965
Fix for ARC sysctls ignored at runtime
loli10K Dec 28, 2019
b051968
ZTS: Various test case fixes
behlendorf Dec 19, 2019
f28e58b
Update maximum kernel version to 5.4
behlendorf Dec 23, 2019
421f8a2
ZTS: Test case failures
behlendorf Dec 26, 2019
bb04f9c
Cancel initialize and TRIM before vdev_metaslab_fini()
behlendorf Dec 26, 2019
0d55a09
libspl: declare aok extern in header
dankamongmen Dec 26, 2019
5b8f560
In initramfs, do not prompt if keylocation is "file://"
sam-lunt Dec 26, 2019
da6a7f0
Avoid some crashes when importing a pool with corrupt metadata
smokris Dec 26, 2019
16777b7
ZTS: devices_001_pos and devices_002_neg
behlendorf Dec 27, 2019
9aec347
ZTS: zfs_program_json
behlendorf Dec 27, 2019
70d2e93
ZTS: Replace /var/tmp with $TEST_BASE_DIR
behlendorf Dec 28, 2019
756c58c
ZTS: Fix pool_state cleanup
behlendorf Dec 28, 2019
c7dc6f3
zfs-load-key.sh: ${ZFS} is not the zfs binary
bencord0 Dec 29, 2019
0a37abc
zdb: print block checksums with 6 d's of verbosity
nedbass Dec 30, 2019
82be309
ZTS: Cleanup partition tables
behlendorf Jan 6, 2020
543b0c6
Fix zfs-0.8.3 'make lint' warnings
tonyhutter Jan 7, 2020
7eaaa6f
Fix zfs-0.8.3 zfs_receive_raw test case
tonyhutter Jan 3, 2020
0fd9a28
Fix QAT allocation failure return value
behlendorf Jan 6, 2020
1be3cba
Prevent unnecessary resilver restarts
jwpoduska Nov 27, 2019
504aae7
ZTS: Fixes for spurious failures of resilver_restart_001 test
jwpoduska Dec 10, 2019
9e36832
Fix zfs-0.8.3 "qat.h"
tonyhutter Jan 22, 2020
9bb3d57
Tag zfs-0.8.3
tonyhutter Dec 27, 2019
64f2567
[WIP] raidz expansion, alpha preview 1
ahrens Apr 3, 2018
c8fb0c7
Changes to adjust to renamed functions in zfs 0.8.3
thorsteneb Mar 31, 2020
f30b12a
raidz merge so that git push succeeds; kept all local file versions f…
thorsteneb Mar 31, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix zfs-0.8.3 'make lint' warnings
Fix these lint warnings on zfs-0.8.3:

$ make lint
[module/spl/spl-vnode.c:494]: (error) Uninitialized variable: fp
[module/spl/spl-vnode.c:706]: (error) Uninitialized variable: fp
[module/spl/spl-vnode.c:706]: (error) Uninitialized variable: next_fp
^CMakefile:1632: recipe for target 'cppcheck' failed
make: *** [cppcheck] Interrupt

Signed-off-by: Tony Hutter <[email protected]>
  • Loading branch information
tonyhutter committed Jan 22, 2020
commit 543b0c644a36a5804e65e6009db48d10e3dadfc3
4 changes: 2 additions & 2 deletions module/spl/spl-vnode.c
Original file line number Diff line number Diff line change
@@ -489,7 +489,7 @@ EXPORT_SYMBOL(vn_space);
static file_t *
file_find(int fd, struct task_struct *task)
{
file_t *fp;
file_t *fp = NULL;

list_for_each_entry(fp, &vn_file_list, f_list) {
if (fd == fp->f_fd && fp->f_task == task) {
@@ -698,7 +698,7 @@ spl_vn_init(void)
void
spl_vn_fini(void)
{
file_t *fp, *next_fp;
file_t *fp = NULL, *next_fp = NULL;
int leaked = 0;

spin_lock(&vn_file_lock);