diff options
| author | Brian Behlendorf <[email protected]> | 2014-07-15 13:29:57 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2014-07-17 15:15:07 -0700 |
| commit | 1e8db7710220332808920a582e5794d6fc37b109 (patch) | |
| tree | 5480855f5bc841e32703bc7cf4f0835b212f3077 /module/zfs/zpl_file.c | |
| parent | a5778ea2427bd340e3b4f697d9b6e1452bd71909 (diff) | |
Fix zil_commit() NULL dereference
Update the current code to ensure inodes are never dirtied if they are
part of a read-only file system or snapshot. If they do somehow get
dirtied an attempt will make made to write them to disk. In the case
of snapshots, which don't have a ZIL, this will result in a NULL
dereference in zil_commit().
Signed-off-by: Richard Yao <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #2405
Diffstat (limited to 'module/zfs/zpl_file.c')
| -rw-r--r-- | module/zfs/zpl_file.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/module/zfs/zpl_file.c b/module/zfs/zpl_file.c index 2a7bcb9b0..d37cf07f9 100644 --- a/module/zfs/zpl_file.c +++ b/module/zfs/zpl_file.c @@ -55,7 +55,7 @@ zpl_release(struct inode *ip, struct file *filp) int error; if (ITOZ(ip)->z_atime_dirty) - mark_inode_dirty(ip); + zfs_mark_inode_dirty(ip); crhold(cr); error = -zfs_close(ip, filp->f_flags, cr); @@ -445,7 +445,8 @@ zpl_writepages(struct address_space *mapping, struct writeback_control *wbc) if (sync_mode != wbc->sync_mode) { ZFS_ENTER(zsb); ZFS_VERIFY_ZP(zp); - zil_commit(zsb->z_log, zp->z_id); + if (zsb->z_log != NULL) + zil_commit(zsb->z_log, zp->z_id); ZFS_EXIT(zsb); /* |