tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

nlm: minor refactoring

Make this lookup slightly more concise, and prepare for changing how we
look this up in a following patch.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

authored by

J. Bruce Fields and committed by
Chuck Lever a81041b7 2dc6f19e

+10 -10
+8 -8
fs/lockd/svclock.c
··· 474 474 __be32 ret; 475 475 476 476 dprintk("lockd: nlmsvc_lock(%s/%ld, ty=%d, pi=%d, %Ld-%Ld, bl=%d)\n", 477 - locks_inode(file->f_file)->i_sb->s_id, 478 - locks_inode(file->f_file)->i_ino, 477 + nlmsvc_file_inode(file)->i_sb->s_id, 478 + nlmsvc_file_inode(file)->i_ino, 479 479 lock->fl.fl_type, lock->fl.fl_pid, 480 480 (long long)lock->fl.fl_start, 481 481 (long long)lock->fl.fl_end, ··· 581 581 struct nlm_lockowner *test_owner; 582 582 583 583 dprintk("lockd: nlmsvc_testlock(%s/%ld, ty=%d, %Ld-%Ld)\n", 584 - locks_inode(file->f_file)->i_sb->s_id, 585 - locks_inode(file->f_file)->i_ino, 584 + nlmsvc_file_inode(file)->i_sb->s_id, 585 + nlmsvc_file_inode(file)->i_ino, 586 586 lock->fl.fl_type, 587 587 (long long)lock->fl.fl_start, 588 588 (long long)lock->fl.fl_end); ··· 644 644 int error; 645 645 646 646 dprintk("lockd: nlmsvc_unlock(%s/%ld, pi=%d, %Ld-%Ld)\n", 647 - locks_inode(file->f_file)->i_sb->s_id, 648 - locks_inode(file->f_file)->i_ino, 647 + nlmsvc_file_inode(file)->i_sb->s_id, 648 + nlmsvc_file_inode(file)->i_ino, 649 649 lock->fl.fl_pid, 650 650 (long long)lock->fl.fl_start, 651 651 (long long)lock->fl.fl_end); ··· 673 673 int status = 0; 674 674 675 675 dprintk("lockd: nlmsvc_cancel(%s/%ld, pi=%d, %Ld-%Ld)\n", 676 - locks_inode(file->f_file)->i_sb->s_id, 677 - locks_inode(file->f_file)->i_ino, 676 + nlmsvc_file_inode(file)->i_sb->s_id, 677 + nlmsvc_file_inode(file)->i_ino, 678 678 lock->fl.fl_pid, 679 679 (long long)lock->fl.fl_start, 680 680 (long long)lock->fl.fl_end);
+2 -2
fs/lockd/svcsubs.c
··· 45 45 46 46 static inline void nlm_debug_print_file(char *msg, struct nlm_file *file) 47 47 { 48 - struct inode *inode = locks_inode(file->f_file); 48 + struct inode *inode = nlmsvc_file_inode(file); 49 49 50 50 dprintk("lockd: %s %s/%ld\n", 51 51 msg, inode->i_sb->s_id, inode->i_ino); ··· 416 416 { 417 417 struct super_block *sb = datap; 418 418 419 - return sb == locks_inode(file->f_file)->i_sb; 419 + return sb == nlmsvc_file_inode(file)->i_sb; 420 420 } 421 421 422 422 /**