From 8c2e5d6972fd03acff060a055e31deb7e7af5391 Mon Sep 17 00:00:00 2001 From: Steve French Date: Tue, 9 Mar 2010 20:30:42 +0000 Subject: [PATCH] --- yaml --- r: 188539 b: refs/heads/master c: ff215713eb33c56301cf6bfec0143ddc7f22c138 h: refs/heads/master i: 188537: 3013ce9426032195b93b213badbde8f55597a4fc 188535: 61af4d1722b09bec7c1135511f5f3f8a3358f79e v: v3 --- [refs] | 2 +- trunk/fs/cifs/file.c | 4 ++-- trunk/fs/cifs/inode.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 31a42646cec4..1843aff89337 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: abab095d1fd25986b910d3c46289d8fa3582cdc5 +refs/heads/master: ff215713eb33c56301cf6bfec0143ddc7f22c138 diff --git a/trunk/fs/cifs/file.c b/trunk/fs/cifs/file.c index 1389f6ecef9e..ca2ba7a0193c 100644 --- a/trunk/fs/cifs/file.c +++ b/trunk/fs/cifs/file.c @@ -219,8 +219,8 @@ static inline int cifs_open_inode_helper(struct inode *inode, struct file *file, cFYI(1, ("inode unchanged on server")); } else { if (file->f_path.dentry->d_inode->i_mapping) { - /* BB no need to lock inode until after invalidate - since namei code should already have it locked? */ + /* BB no need to lock inode until after invalidate + since namei code should already have it locked? */ rc = filemap_write_and_wait(file->f_path.dentry->d_inode->i_mapping); if (rc != 0) CIFS_I(file->f_path.dentry->d_inode)->write_behind_rc = rc; diff --git a/trunk/fs/cifs/inode.c b/trunk/fs/cifs/inode.c index 0d034a84bb8d..723daaccbd0e 100644 --- a/trunk/fs/cifs/inode.c +++ b/trunk/fs/cifs/inode.c @@ -510,9 +510,9 @@ int cifs_get_file_info(struct file *filp) if (rc == -EOPNOTSUPP || rc == -EINVAL) { /* * FIXME: legacy server -- fall back to path-based call? - * for now, just skip revalidating and mark inode for - * immediate reval. - */ + * for now, just skip revalidating and mark inode for + * immediate reval. + */ rc = 0; CIFS_I(inode)->time = 0; goto cgfi_exit;