From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Steve French" Subject: Re: [RFC] patch to add support for leases to cifs Date: Wed, 22 Oct 2008 00:33:54 -0500 Message-ID: <524f69650810212233h4ec73268nf607cafea78bc134@mail.gmail.com> References: <524f69650810211503y67ed9418t2076e9e0ed5601e9@mail.gmail.com> <91b13c310810212143m51d9bb2bwe6b37fe6d5e67f8a@mail.gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit To: "linux-cifs-client@lists.samba.org" , linux-fsdevel Return-path: Received: from wf-out-1314.google.com ([209.85.200.168]:25028 "EHLO wf-out-1314.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751301AbYJVFdz (ORCPT ); Wed, 22 Oct 2008 01:33:55 -0400 Received: by wf-out-1314.google.com with SMTP id 27so2855269wfd.4 for ; Tue, 21 Oct 2008 22:33:54 -0700 (PDT) In-Reply-To: <91b13c310810212143m51d9bb2bwe6b37fe6d5e67f8a@mail.gmail.com> Content-Disposition: inline Sender: linux-fsdevel-owner@vger.kernel.org List-ID: > Why not include it inlined in the mail body? Inlined as requested. diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index c6aad77..aaa6f37 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@ -618,6 +618,26 @@ static loff_t cifs_llseek(struct file *file, loff_t offset, int origin) return generic_file_llseek_unlocked(file, offset, origin); } +#ifdef CONFIG_CIFS_EXPERIMENTAL +static int cifs_setlease(struct file *file, long arg, struct file_lock **lease) +{ + /* note that this is called by vfs setlease with the BKL held + although I doubt that BKL is needed here in cifs */ + + if (!(S_ISREG(inode->i_mode)) + return -EINVAL; + + /* check if file is oplocked */ + if (((arg == F_RDLCK) && + (CIFS_I(file->f_path.dentry->d_inode)->clientCanCacheRead)) || + ((arg == F_WRLCK) && + (CIFS_I(file->f_path.dentry->d_inode)->clientCanCacheAll))) + return generic_setlease(file, arg, lease); + else + return -EAGAIN; +} +#endif + struct file_system_type cifs_fs_type = { .owner = THIS_MODULE, .name = "cifs", @@ -696,6 +716,7 @@ const struct file_operations cifs_file_ops = { #ifdef CONFIG_CIFS_EXPERIMENTAL .dir_notify = cifs_dir_notify, + .setlease = cifs_setlease, #endif /* CONFIG_CIFS_EXPERIMENTAL */ }; @@ -716,6 +737,7 @@ const struct file_operations cifs_file_direct_ops = { .llseek = cifs_llseek, #ifdef CONFIG_CIFS_EXPERIMENTAL .dir_notify = cifs_dir_notify, + .setlease = cifs_setlease, #endif /* CONFIG_CIFS_EXPERIMENTAL */ }; const struct file_operations cifs_file_nobrl_ops = { @@ -736,6 +758,7 @@ const struct file_operations cifs_file_nobrl_ops = { #ifdef CONFIG_CIFS_EXPERIMENTAL .dir_notify = cifs_dir_notify, + .setlease = cifs_setlease, #endif /* CONFIG_CIFS_EXPERIMENTAL */ }; @@ -755,6 +778,7 @@ const struct file_operations cifs_file_direct_nobrl_ops = { .llseek = cifs_llseek, #ifdef CONFIG_CIFS_EXPERIMENTAL .dir_notify = cifs_dir_notify, + .setlease = cifs_setlease, #endif /* CONFIG_CIFS_EXPERIMENTAL */ }; @@ -946,6 +970,12 @@ static int cifs_oplock_thread(void *dummyarg) the call */ /* mutex_lock(&inode->i_mutex);*/ if (S_ISREG(inode->i_mode)) { +#ifdef CONFIG_CIFS_EXPERIMENTAL + if (CIFS_I(inode)->clientCanCacheAll == 0) + break_lease(inode, FMODE_READ); + else if (CIFS_I(inode)->clientCanCacheRead == 0) + break_lease(inode, FMODE_WRITE); +#endif rc = filemap_fdatawrite(inode->i_mapping); if (CIFS_I(inode)->clientCanCacheRead == 0) { waitrc = filemap_fdatawait( > On Wed, Oct 22, 2008 at 6:03 AM, Steve French wrote: >> fcntl(F_SETLEASE) currently is not exported by cifs (nor by local file >> systems) so cifs grants leases based on how other local processes have >> opened the file not by whether the file is cacheable (oplocked). This >> adds the check to make sure that the file is cacheable on the client >> before checking whether we can grant the lease locally >> (generic_setlease). -- Thanks, Steve