aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs/cifsfs.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2013-01-23 17:07:38 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2013-02-22 23:31:31 -0500
commit496ad9aa8ef448058e36ca7a787c61f2e63f0f54 (patch)
tree8f4abde793cd7db5bb8fde6d27ebcacd0e54379a /fs/cifs/cifsfs.c
parent57eccb830f1cc93d4b506ba306d8dfa685e0c88f (diff)
new helper: file_inode(file)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/cifs/cifsfs.c')
-rw-r--r--fs/cifs/cifsfs.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index de7f9168a118..8b35365c70be 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -677,7 +677,7 @@ out_nls:
677static ssize_t cifs_file_aio_write(struct kiocb *iocb, const struct iovec *iov, 677static ssize_t cifs_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
678 unsigned long nr_segs, loff_t pos) 678 unsigned long nr_segs, loff_t pos)
679{ 679{
680 struct inode *inode = iocb->ki_filp->f_path.dentry->d_inode; 680 struct inode *inode = file_inode(iocb->ki_filp);
681 ssize_t written; 681 ssize_t written;
682 int rc; 682 int rc;
683 683
@@ -701,7 +701,7 @@ static loff_t cifs_llseek(struct file *file, loff_t offset, int whence)
701 */ 701 */
702 if (whence != SEEK_SET && whence != SEEK_CUR) { 702 if (whence != SEEK_SET && whence != SEEK_CUR) {
703 int rc; 703 int rc;
704 struct inode *inode = file->f_path.dentry->d_inode; 704 struct inode *inode = file_inode(file);
705 705
706 /* 706 /*
707 * We need to be sure that all dirty pages are written and the 707 * We need to be sure that all dirty pages are written and the
@@ -733,7 +733,7 @@ static int cifs_setlease(struct file *file, long arg, struct file_lock **lease)
733{ 733{
734 /* note that this is called by vfs setlease with lock_flocks held 734 /* note that this is called by vfs setlease with lock_flocks held
735 to protect *lease from going away */ 735 to protect *lease from going away */
736 struct inode *inode = file->f_path.dentry->d_inode; 736 struct inode *inode = file_inode(file);
737 struct cifsFileInfo *cfile = file->private_data; 737 struct cifsFileInfo *cfile = file->private_data;
738 738
739 if (!(S_ISREG(inode->i_mode))) 739 if (!(S_ISREG(inode->i_mode)))