diff options
author | Jeff Layton <jlayton@redhat.com> | 2010-10-15 15:33:59 -0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2010-10-18 01:04:19 +0000 |
commit | 15886177e412db00aa86155fe72608c4ebf5a08f (patch) | |
tree | eb4ac34ee40ae499ae2a68c44f71effe657b4504 /fs/cifs/dir.c | |
parent | abfe1eedd682ea0f20e7035445982e6d371a2024 (diff) | |
download | blackbird-op-linux-15886177e412db00aa86155fe72608c4ebf5a08f.tar.gz blackbird-op-linux-15886177e412db00aa86155fe72608c4ebf5a08f.zip |
cifs: clean up cifs_reopen_file
Add a f_flags field that holds the f_flags field from the filp. We'll
need this info in case the filp ever goes away before the cifsFileInfo
does. Have cifs_reopen_file use that value instead of filp->f_flags
too and have it take a cifsFileInfo arg instead of a filp.
While we're at it, get rid of some bogus cargo-cult NULL pointer
checks in that function and reduce the level of indentation.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Suresh Jayaraman <sjayaraman@suse.de>
Acked-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/dir.c')
-rw-r--r-- | fs/cifs/dir.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c index 36cf3e2ec252..3c23d882a44c 100644 --- a/fs/cifs/dir.c +++ b/fs/cifs/dir.c @@ -147,6 +147,7 @@ cifs_new_fileinfo(__u16 fileHandle, struct file *file, pCifsFile->pid = current->tgid; pCifsFile->uid = current_fsuid(); pCifsFile->dentry = dget(dentry); + pCifsFile->f_flags = file->f_flags; pCifsFile->pfile = file; pCifsFile->invalidHandle = false; pCifsFile->closePend = false; |