diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-06-01 11:55:38 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-06-01 11:55:38 +1000 |
commit | 7021751b267720b663930f8cf0ee3788ec461c2e (patch) | |
tree | 577fe567a7bee74aaa3ccde5ebaa4c5439109220 /fs/locks.c | |
parent | fd1008e9e457ca24486c1c2ed7798140277d2ad2 (diff) | |
parent | d888ee6a7e8ca577c77541f7f7c9b772554078d4 (diff) |
Merge remote-tracking branch 'vfs/for-next'
Diffstat (limited to 'fs/locks.c')
-rw-r--r-- | fs/locks.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/fs/locks.c b/fs/locks.c index 40bcbaaa3f52..5e68455559db 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -2782,22 +2782,10 @@ static const struct seq_operations locks_seq_operations = { .show = locks_show, }; -static int locks_open(struct inode *inode, struct file *filp) -{ - return seq_open_private(filp, &locks_seq_operations, - sizeof(struct locks_iterator)); -} - -static const struct file_operations proc_locks_operations = { - .open = locks_open, - .read = seq_read, - .llseek = seq_lseek, - .release = seq_release_private, -}; - static int __init proc_locks_init(void) { - proc_create("locks", 0, NULL, &proc_locks_operations); + proc_create_seq_private("locks", 0, NULL, &locks_seq_operations, + sizeof(struct locks_iterator), NULL); return 0; } fs_initcall(proc_locks_init); |