From: J. Bruce Fields <bfields@citi.umich.edu> As Peter Staubach says elsewhere (http://marc.info/?l=linux-kernel&m=118113649526444&w=2):Define an nfs setlease method that just returns -EINVAL. If someone can demonstrate a real need, perhaps we could reenable them in the presence of the "nolock" mount option. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Cc: Peter Staubach <staubach@redhat.com> --- fs/nfs/file.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/fs/nfs/file.c b/fs/nfs/file.c index 9eb8eb4..467671b 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -51,6 +51,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, @@ -67,6 +68,7 @@ const struct file_operations nfs_file_operations = { .flock = nfs_flock, .sendfile = nfs_file_sendfile, .check_flags = nfs_check_flags, + .setlease = nfs_setlease, }; const struct inode_operations nfs_file_inode_operations = { @@ -555,3 +557,8 @@ 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) +{ + return -EINVAL; +} -- 1.5.2 - To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
| Michał Kudła | [2.6.26-rc5] iwlwifi 4965 not working - last on 2.6.23 |
| monstr | [PATCH 52/60] microblaze_v4: fcntl.h sockios.h ucontext.h |
| James Bottomley | Re: Integration of SCST in the mainstream Linux kernel |
| Nick Piggin | [rfc] no ZERO_PAGE? |
git: | |
| Patrick Altman | Git Library? |
| Jakub Narebski | Re: [RFC] origin link for cherry-pick and revert |
| Avery Pennarun | [bug] Segfault in git rev-list --first-parent --bisect |
| skimo | [PATCH 16/22] unpack-trees.c: optionally clone submodules for later checkout |
| Richard Stallman | Real men don't attack straw men |
| Marco Peereboom | Re: Real men don't attack straw men |
| James Hartley | scp batch mode? |
| Brandon Lee | DELL PERC 5iR slow performance |
| Julius Volz | [PATCH RFC 13/24] IPVS: Add IPv6 support to ip_vs_conn_hashkey() |
| Christopher Snook | RFC: Nagle latency tuning |
| David Miller | Re: [PATCH 10/11] [IPSEC]: Disallow combinations of RO and AH/ESP/IPCOMP |
| Jeff Kirsher | [RESEND][NET-NEXT PATCH 04/29] ixgbe: Update watchdog thread to accomodate longerl... |
