diff options
| author | Jeff Layton <jlayton@primarydata.com> | 2014-08-22 10:18:45 -0400 |
|---|---|---|
| committer | Jeff Layton <jlayton@primarydata.com> | 2014-10-07 14:06:12 -0400 |
| commit | 0efaa7e82f02fe69c05ad28e905f31fc86e6f08e (patch) | |
| tree | bf7e9d91c5800da259fa3ee9907287ba2b2d6cc1 /include/trace | |
| parent | 415b96c5a1fe31ed9deb0618e95ecbb1df3de54c (diff) | |
| download | linux-stable-0efaa7e82f02fe69c05ad28e905f31fc86e6f08e.tar.gz linux-stable-0efaa7e82f02fe69c05ad28e905f31fc86e6f08e.tar.bz2 linux-stable-0efaa7e82f02fe69c05ad28e905f31fc86e6f08e.zip | |
locks: generic_delete_lease doesn't need a file_lock at all
Ensure that it's OK to pass in a NULL file_lock double pointer on
a F_UNLCK request and convert the vfs_setlease F_UNLCK callers to
do just that.
Finally, turn the BUG_ON in generic_setlease into a WARN_ON_ONCE
with an error return. That's a problem we can handle without
crashing the box if it occurs.
Signed-off-by: Jeff Layton <jlayton@primarydata.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/events/filelock.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/trace/events/filelock.h b/include/trace/events/filelock.h index 59d11c22f076..a0d008070962 100644 --- a/include/trace/events/filelock.h +++ b/include/trace/events/filelock.h @@ -53,15 +53,15 @@ DECLARE_EVENT_CLASS(filelock_lease, ), TP_fast_assign( - __entry->fl = fl; + __entry->fl = fl ? fl : NULL; __entry->s_dev = inode->i_sb->s_dev; __entry->i_ino = inode->i_ino; - __entry->fl_next = fl->fl_next; - __entry->fl_owner = fl->fl_owner; - __entry->fl_flags = fl->fl_flags; - __entry->fl_type = fl->fl_type; - __entry->fl_break_time = fl->fl_break_time; - __entry->fl_downgrade_time = fl->fl_downgrade_time; + __entry->fl_next = fl ? fl->fl_next : NULL; + __entry->fl_owner = fl ? fl->fl_owner : NULL; + __entry->fl_flags = fl ? fl->fl_flags : 0; + __entry->fl_type = fl ? fl->fl_type : 0; + __entry->fl_break_time = fl ? fl->fl_break_time : 0; + __entry->fl_downgrade_time = fl ? fl->fl_downgrade_time : 0; ), TP_printk("fl=0x%p dev=0x%x:0x%x ino=0x%lx fl_next=0x%p fl_owner=0x%p fl_flags=%s fl_type=%s fl_break_time=%lu fl_downgrade_time=%lu", |