.. and thereby eliminate some redundant code.
All the callers already have a pointer to struct cifsInodeInfo. Use it.
Cc: Pavel Shilovsky <piastryyy@xxxxxxxxx>
Signed-off-by: Suresh Jayaraman <sjayaraman@xxxxxxx>
---
fs/cifs/cifsproto.h | 3 ++-
fs/cifs/file.c | 8 ++++----
fs/cifs/misc.c | 12 ++++++------
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h
index 7f050f4..f71c4d3 100644
--- a/fs/cifs/cifsproto.h
+++ b/fs/cifs/cifsproto.h
@@ -104,7 +104,8 @@ extern struct timespec cifs_NTtimeToUnix(__le64 utc_nanoseconds_since_1601);
extern u64 cifs_UnixTimeToNT(struct timespec);
extern struct timespec cnvrtDosUnixTm(__le16 le_date, __le16 le_time,
int offset);
-extern void cifs_set_oplock_level(struct inode *inode, __u32 oplock);
+extern void cifs_set_oplock_level(struct cifsInodeInfo *cifs_inode,
+ __u32 oplock);
extern struct cifsFileInfo *cifs_new_fileinfo(__u16 fileHandle,
struct file *file, struct tcon_link *tlink,
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 71185d1..a0d13c7 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -146,7 +146,7 @@ client_can_cache:
rc = cifs_get_inode_info(&inode, full_path, buf, inode->i_sb,
xid, NULL);
- cifs_set_oplock_level(inode, oplock);
+ cifs_set_oplock_level(pCifsInode, oplock);
return rc;
}
@@ -248,7 +248,7 @@ cifs_new_fileinfo(__u16 fileHandle, struct file *file,
list_add_tail(&pCifsFile->flist, &pCifsInode->openFileList);
spin_unlock(&cifs_file_list_lock);
- cifs_set_oplock_level(inode, oplock);
+ cifs_set_oplock_level(pCifsInode, oplock);
file->private_data = pCifsFile;
return pCifsFile;
@@ -279,7 +279,7 @@ void cifsFileInfo_put(struct cifsFileInfo *cifs_file)
if (list_empty(&cifsi->openFileList)) {
cFYI(1, "closing last open instance for inode %p",
cifs_file->dentry->d_inode);
- cifs_set_oplock_level(inode, 0);
+ cifs_set_oplock_level(cifsi, 0);
}
spin_unlock(&cifs_file_list_lock);
@@ -611,7 +611,7 @@ reopen_success:
we can not go to the server to get the new inod
info */
- cifs_set_oplock_level(inode, oplock);
+ cifs_set_oplock_level(pCifsInode, oplock);
cifs_relock_file(pCifsFile);
diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
index d3b9dde..a543f1a 100644
--- a/fs/cifs/misc.c
+++ b/fs/cifs/misc.c
@@ -570,7 +570,7 @@ is_valid_oplock_break(struct smb_hdr *buf, struct TCP_Server_Info *srv)
cFYI(1, "file id match, oplock break");
pCifsInode = CIFS_I(netfile->dentry->d_inode);
- cifs_set_oplock_level(netfile->dentry->d_inode,
+ cifs_set_oplock_level(pCifsInode,
pSMB->OplockLevel);
/*
* cifs_oplock_break_put() can't be called
@@ -722,18 +722,18 @@ cifs_autodisable_serverino(struct cifs_sb_info *cifs_sb)
}
}
-void cifs_set_oplock_level(struct inode *inode, __u32 oplock)
+void cifs_set_oplock_level(struct cifsInodeInfo *cinode, __u32 oplock)
{
- struct cifsInodeInfo *cinode = CIFS_I(inode);
-
if ((oplock & 0xF) == OPLOCK_EXCLUSIVE) {
cinode->clientCanCacheAll = true;
cinode->clientCanCacheRead = true;
- cFYI(1, "Exclusive Oplock granted on inode %p", inode);
+ cFYI(1, "Exclusive Oplock granted on inode %p",
+ &cinode->vfs_inode);
} else if ((oplock & 0xF) == OPLOCK_READ) {
cinode->clientCanCacheAll = false;
cinode->clientCanCacheRead = true;
- cFYI(1, "Level II Oplock granted on inode %p", inode);
+ cFYI(1, "Level II Oplock granted on inode %p",
+ &cinode->vfs_inode);
} else {
cinode->clientCanCacheAll = false;
cinode->clientCanCacheRead = false;
--
To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
