The patch titled
nfs: nfs and nfsd should depend upon CONFIG_FILE_LOCKING
has been removed from the -mm tree. Its filename was
nfs-nfs-and-nfsd-should-depend-upon-config_file_locking.patch
This patch was dropped because other changes were merged, which wrecked this patch
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: nfs: nfs and nfsd should depend upon CONFIG_FILE_LOCKING
From: Manish Katiyar <mkatiyar@xxxxxxxxx>
fs/nfsd/nfs4state.c:1657: warning: unused variable 'flp'
Bruce said "I don't believe we want to support a .config with NFS or NFSD
turned on but CONFIG_FILE_LOCKING off". No reason was given.
Enable NFS_FS and NFSD only when FILE_LOCKING is enabled.
Signed-off-by: Manish Katiyar <mkatiyar@xxxxxxxxx>
Cc: "J. Bruce Fields" <bfields@xxxxxxxxxxxx>
Cc: Chuck Lever <chuck.lever@xxxxxxxxxx>
Cc: Trond Myklebust <trond.myklebust@xxxxxxxxxx>
Cc: Neil Brown <neilb@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/Kconfig | 2 ++
1 file changed, 2 insertions(+)
diff -puN fs/Kconfig~nfs-nfs-and-nfsd-should-depend-upon-config_file_locking fs/Kconfig
--- a/fs/Kconfig~nfs-nfs-and-nfsd-should-depend-upon-config_file_locking
+++ a/fs/Kconfig
@@ -253,6 +253,7 @@ if NETWORK_FILESYSTEMS
config NFS_FS
tristate "NFS client support"
depends on INET
+ depends on FILE_LOCKING
select LOCKD
select SUNRPC
select NFS_ACL_SUPPORT if NFS_V3_ACL
@@ -349,6 +350,7 @@ config NFS_FSCACHE
config NFSD
tristate "NFS server support"
depends on INET
+ depends on FILE_LOCKING
select LOCKD
select SUNRPC
select EXPORTFS
_
Patches currently in -mm which might be from mkatiyar@xxxxxxxxx are
origin.patch
rtc-ds1390-fix-compilation-warnings-in-drivers-rtc-rtc-ds1390c.patch
linux-next.patch
nfs-nfs-and-nfsd-should-depend-upon-config_file_locking.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
