diff options
Diffstat (limited to 'fs/cifs/cifsfs.c')
| -rw-r--r-- | fs/cifs/cifsfs.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index 889b98455750..9d7996e8e793 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c | |||
| @@ -813,7 +813,8 @@ static loff_t cifs_llseek(struct file *file, loff_t offset, int whence) | |||
| 813 | return generic_file_llseek(file, offset, whence); | 813 | return generic_file_llseek(file, offset, whence); |
| 814 | } | 814 | } |
| 815 | 815 | ||
| 816 | static int cifs_setlease(struct file *file, long arg, struct file_lock **lease) | 816 | static int |
| 817 | cifs_setlease(struct file *file, long arg, struct file_lock **lease, void **priv) | ||
| 817 | { | 818 | { |
| 818 | /* | 819 | /* |
| 819 | * Note that this is called by vfs setlease with i_lock held to | 820 | * Note that this is called by vfs setlease with i_lock held to |
| @@ -829,7 +830,7 @@ static int cifs_setlease(struct file *file, long arg, struct file_lock **lease) | |||
| 829 | if (arg == F_UNLCK || | 830 | if (arg == F_UNLCK || |
| 830 | ((arg == F_RDLCK) && CIFS_CACHE_READ(CIFS_I(inode))) || | 831 | ((arg == F_RDLCK) && CIFS_CACHE_READ(CIFS_I(inode))) || |
| 831 | ((arg == F_WRLCK) && CIFS_CACHE_WRITE(CIFS_I(inode)))) | 832 | ((arg == F_WRLCK) && CIFS_CACHE_WRITE(CIFS_I(inode)))) |
| 832 | return generic_setlease(file, arg, lease); | 833 | return generic_setlease(file, arg, lease, priv); |
| 833 | else if (tlink_tcon(cfile->tlink)->local_lease && | 834 | else if (tlink_tcon(cfile->tlink)->local_lease && |
| 834 | !CIFS_CACHE_READ(CIFS_I(inode))) | 835 | !CIFS_CACHE_READ(CIFS_I(inode))) |
| 835 | /* | 836 | /* |
| @@ -840,7 +841,7 @@ static int cifs_setlease(struct file *file, long arg, struct file_lock **lease) | |||
| 840 | * knows that the file won't be changed on the server by anyone | 841 | * knows that the file won't be changed on the server by anyone |
| 841 | * else. | 842 | * else. |
| 842 | */ | 843 | */ |
| 843 | return generic_setlease(file, arg, lease); | 844 | return generic_setlease(file, arg, lease, priv); |
| 844 | else | 845 | else |
| 845 | return -EAGAIN; | 846 | return -EAGAIN; |
| 846 | } | 847 | } |
