diff --git a/[refs] b/[refs] index b9a174929f64..22bca19b048f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 61b9175808670d9abf52156803ae0ed1e3706ac4 +refs/heads/master: 1e788f8d1ad71fea99a763114eae73c3ad55bc30 diff --git a/trunk/fs/xfs/linux-2.6/xfs_file.c b/trunk/fs/xfs/linux-2.6/xfs_file.c index 70662371bb11..3d4f6dff2113 100644 --- a/trunk/fs/xfs/linux-2.6/xfs_file.c +++ b/trunk/fs/xfs/linux-2.6/xfs_file.c @@ -299,7 +299,8 @@ xfs_file_open( STATIC int xfs_file_close( - struct file *filp) + struct file *filp, + fl_owner_t id) { return -bhv_vop_close(vn_from_inode(filp->f_dentry->d_inode), 0, file_count(filp) > 1 ? L_FALSE : L_TRUE, NULL);