]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
nfs: remove an obsolete nfs_flock comment
authorJ. Bruce Fields <bfields@citi.umich.edu>
Thu, 14 Aug 2008 22:32:55 +0000 (18:32 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Tue, 7 Oct 2008 22:16:21 +0000 (18:16 -0400)
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>
fs/nfs/file.c

index 3ddb00433f4f92782ec2388baef404e9dabdc5c2..d319b49f8f06f4046c408afe8a290a9e05b7920e 100644 (file)
@@ -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;