diff options
author | J. Bruce Fields <bfields@citi.umich.edu> | 2008-08-14 18:32:55 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-10-07 18:16:21 -0400 |
commit | f200c11c257b8db5c49dfc0b7f84bceae3109779 (patch) | |
tree | ade25b51f12ee12ad4f58dd7020264e7ff695426 /fs | |
parent | 44d5759d3fdad660f000ef319f0ec33a6ac6ae28 (diff) |
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.c | 7 |
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) | |||
702 | filp->f_path.dentry->d_name.name, | 702 | filp->f_path.dentry->d_name.name, |
703 | fl->fl_type, fl->fl_flags); | 703 | fl->fl_type, fl->fl_flags); |
704 | 704 | ||
705 | /* | ||
706 | * No BSD flocks over NFS allowed. | ||
707 | * Note: we could try to fake a POSIX lock request here by | ||
708 | * using ((u32) filp | 0x80000000) or some such as the pid. | ||
709 | * Not sure whether that would be unique, though, or whether | ||
710 | * that would break in other places. | ||
711 | */ | ||
712 | if (!(fl->fl_flags & FL_FLOCK)) | 705 | if (!(fl->fl_flags & FL_FLOCK)) |
713 | return -ENOLCK; | 706 | return -ENOLCK; |
714 | 707 | ||