summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2008-08-14 18:32:55 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2008-10-07 18:16:21 -0400
commitf200c11c257b8db5c49dfc0b7f84bceae3109779 (patch)
treeade25b51f12ee12ad4f58dd7020264e7ff695426 /fs
parent44d5759d3fdad660f000ef319f0ec33a6ac6ae28 (diff)
downloadlinux-stable-f200c11c257b8db5c49dfc0b7f84bceae3109779.tar.gz
linux-stable-f200c11c257b8db5c49dfc0b7f84bceae3109779.tar.bz2
linux-stable-f200c11c257b8db5c49dfc0b7f84bceae3109779.zip
nfs: remove an obsolete nfs_flock comment
We *do* now allow bsd flocks over nfs. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/file.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index 3ddb00433f4f..d319b49f8f06 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -702,13 +702,6 @@ static int nfs_flock(struct file *filp, int cmd, struct file_lock *fl)
filp->f_path.dentry->d_name.name,
fl->fl_type, fl->fl_flags);
- /*
- * No BSD flocks over NFS allowed.
- * Note: we could try to fake a POSIX lock request here by
- * using ((u32) filp | 0x80000000) or some such as the pid.
- * Not sure whether that would be unique, though, or whether
- * that would break in other places.
- */
if (!(fl->fl_flags & FL_FLOCK))
return -ENOLCK;