Merge branch 'nfsd-next' of git://linux-nfs.org/~bfields/linux

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / include / linux / fs.h

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 8fabb037a48db40e8a490fc74c15ce907ad9059a..b178f9e91e23c473e39881c33ee3a36544cefa90 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1163,9 +1163,10 @@ struct lock_manager {
        struct list_head list;
 };
 
-void locks_start_grace(struct lock_manager *);
+struct net;
+void locks_start_grace(struct net *, struct lock_manager *);
 void locks_end_grace(struct lock_manager *);
-int locks_in_grace(void);
+int locks_in_grace(struct net *);
 
 /* that will die - we need it for nfs_lock_info */
 #include <linux/nfs_fs_i.h>