locks: pass inode pointer to locks_free_lock_context

...so we can print information about it if there are leaked locks.

Signed-off-by: Jeff Layton <jeff.layton@primarydata.com>
Acked-by: "J. Bruce Fields" <bfields@fieldses.org>

diff --git a/fs/inode.c b/fs/inode.c
index 1be5f9003eb38852f68957fcd287cdd5b820b310..ab6c84159f9d9e367f8edd92146204c42f770d47 100644 (file)
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -225,7 +225,7 @@ void __destroy_inode(struct inode *inode)
        inode_detach_wb(inode);
        security_inode_free(inode);
        fsnotify_inode_delete(inode);
-       locks_free_lock_context(inode->i_flctx);
+       locks_free_lock_context(inode);
        if (!inode->i_nlink) {
                WARN_ON(atomic_long_read(&inode->i_sb->s_remove_count) == 0);
                atomic_long_dec(&inode->i_sb->s_remove_count);

diff --git a/fs/locks.c b/fs/locks.c
index 0af2387bd91e38c47dcaa498e72246b085fd2051..ed9ab930d0930d8c455c54cd2c10bdd09e1710a4 100644 (file)
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -234,8 +234,10 @@ out:
 }
 
 void
-locks_free_lock_context(struct file_lock_context *ctx)
+locks_free_lock_context(struct inode *inode)
 {
+       struct file_lock_context *ctx = inode->i_flctx;
+
        if (ctx) {
                WARN_ON_ONCE(!list_empty(&ctx->flc_flock));
                WARN_ON_ONCE(!list_empty(&ctx->flc_posix));

diff --git a/include/linux/fs.h b/include/linux/fs.h
index cbf08d5c246ea4d564ce84f5322da7e52db7fdbf..6c4983aceb02d92a3b1e16f89b3d03c7adc9c3fb 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1042,7 +1042,7 @@ extern int fcntl_setlease(unsigned int fd, struct file *filp, long arg);
 extern int fcntl_getlease(struct file *filp);
 
 /* fs/locks.c */
-void locks_free_lock_context(struct file_lock_context *ctx);
+void locks_free_lock_context(struct inode *inode);
 void locks_free_lock(struct file_lock *fl);
 extern void locks_init_lock(struct file_lock *);
 extern struct file_lock * locks_alloc_lock(void);
@@ -1103,7 +1103,7 @@ static inline int fcntl_getlease(struct file *filp)
 }
 
 static inline void
-locks_free_lock_context(struct file_lock_context *ctx)
+locks_free_lock_context(struct inode *inode)
 {
 }