On Fri, 17 Sep 2010 19:43:10 +0530 Suresh Jayaraman <[email protected]> wrote:
> ... and avoid implicit casting from a signed type. Also, pass oplock by value > instead by reference as we don't intend to change the value in > cifs_open_inode_helper(). > > Thanks to Jeff Layton for spotting this. > > Signed-off-by: Suresh Jayaraman <[email protected]> > --- > > fs/cifs/file.c | 8 ++++---- > 1 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/fs/cifs/file.c b/fs/cifs/file.c > index de748c6..d33da45 100644 > --- a/fs/cifs/file.c > +++ b/fs/cifs/file.c > @@ -165,7 +165,7 @@ psx_client_can_cache: > > /* all arguments to this function must be checked for validity in caller */ > static inline int cifs_open_inode_helper(struct inode *inode, > - struct cifsTconInfo *pTcon, int *oplock, FILE_ALL_INFO *buf, > + struct cifsTconInfo *pTcon, __u32 oplock, FILE_ALL_INFO *buf, > char *full_path, int xid) > { > struct cifsInodeInfo *pCifsInode = CIFS_I(inode); > @@ -207,11 +207,11 @@ client_can_cache: > rc = cifs_get_inode_info(&inode, full_path, buf, inode->i_sb, > xid, NULL); > > - if ((*oplock & 0xF) == OPLOCK_EXCLUSIVE) { > + if ((oplock & 0xF) == OPLOCK_EXCLUSIVE) { > pCifsInode->clientCanCacheAll = true; > pCifsInode->clientCanCacheRead = true; > cFYI(1, "Exclusive Oplock granted on inode %p", inode); > - } else if ((*oplock & 0xF) == OPLOCK_READ) > + } else if ((oplock & 0xF) == OPLOCK_READ) > pCifsInode->clientCanCacheRead = true; > > return rc; > @@ -365,7 +365,7 @@ int cifs_open(struct inode *inode, struct file *file) > goto out; > } > > - rc = cifs_open_inode_helper(inode, tcon, &oplock, buf, full_path, xid); > + rc = cifs_open_inode_helper(inode, tcon, oplock, buf, full_path, xid); > if (rc != 0) > goto out; > > -- > To unsubscribe from this list: send the line "unsubscribe linux-cifs" in > the body of a message to [email protected] > More majordomo info at http://vger.kernel.org/majordomo-info.html > Reviewed-by: Jeff Layton <[email protected]> -- To unsubscribe from this list: send the line "unsubscribe linux-cifs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
