Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 61451
b: refs/heads/master
c: 370f659
h: refs/heads/master
i:
  61449: d9e9e9b
  61447: 7dbdf6f
v: v3
  • Loading branch information
J. Bruce Fields committed Jul 18, 2007
1 parent b6a91d6 commit dc0ae00
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 60446067ba7a8e890a91db3b4a7436fe0ebd2dee
refs/heads/master: 370f6599e8bc03fd9fc6d1a1be00ae0c6373ca59
12 changes: 12 additions & 0 deletions trunk/fs/nfs/file.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ static int nfs_fsync(struct file *, struct dentry *dentry, int datasync);
static int nfs_check_flags(int flags);
static int nfs_lock(struct file *filp, int cmd, struct file_lock *fl);
static int nfs_flock(struct file *filp, int cmd, struct file_lock *fl);
static int nfs_setlease(struct file *file, long arg, struct file_lock **fl);

const struct file_operations nfs_file_operations = {
.llseek = nfs_file_llseek,
Expand All @@ -69,6 +70,7 @@ const struct file_operations nfs_file_operations = {
.flock = nfs_flock,
.splice_read = nfs_file_splice_read,
.check_flags = nfs_check_flags,
.setlease = nfs_setlease,
};

const struct inode_operations nfs_file_inode_operations = {
Expand Down Expand Up @@ -558,3 +560,13 @@ static int nfs_flock(struct file *filp, int cmd, struct file_lock *fl)
return do_unlk(filp, cmd, fl);
return do_setlk(filp, cmd, fl);
}

static int nfs_setlease(struct file *file, long arg, struct file_lock **fl)
{
/*
* There is no protocol support for leases, so we have no way
* to implement them correctly in the face of opens by other
* clients.
*/
return -EINVAL;
}

0 comments on commit dc0ae00

Please sign in to comment.