Commit fa31b02f authored by Steve French's avatar Steve French

Add in cifs fcntl handling to fix remote dnotify problem

parent 2f1df382
Version 1.09
------------
Fix /proc/fs module unload warning message (that could be logged
to the kernel log)
Version 1.08 Version 1.08
------------ ------------
Allow file_mode and dir_mode (specified at mount time) to be enforced Allow file_mode and dir_mode (specified at mount time) to be enforced
......
...@@ -3,4 +3,4 @@ ...@@ -3,4 +3,4 @@
# #
obj-$(CONFIG_CIFS) += cifs.o obj-$(CONFIG_CIFS) += cifs.o
cifs-objs := cifsfs.o cifssmb.o cifs_debug.o connect.o dir.o file.o inode.o link.o misc.o netmisc.o smbdes.o smbencrypt.o transport.o asn1.o md4.o md5.o cifs_unicode.o nterr.o xattr.o cifsencrypt.o cifs-objs := cifsfs.o cifssmb.o cifs_debug.o connect.o dir.o file.o inode.o link.o misc.o netmisc.o smbdes.o smbencrypt.o transport.o asn1.o md4.o md5.o cifs_unicode.o nterr.o xattr.o cifsencrypt.o fcntl.o
/* /*
* fs/cifs/cifsfs.c * fs/cifs/cifsfs.c
* *
* Copyright (C) International Business Machines Corp., 2002,2003 * Copyright (C) International Business Machines Corp., 2002,2004
* Author(s): Steve French (sfrench@us.ibm.com) * Author(s): Steve French (sfrench@us.ibm.com)
* *
* Common Internet FileSystem (CIFS) client * Common Internet FileSystem (CIFS) client
...@@ -537,12 +537,18 @@ struct file_operations cifs_file_ops = { ...@@ -537,12 +537,18 @@ struct file_operations cifs_file_ops = {
.flush = cifs_flush, .flush = cifs_flush,
.mmap = cifs_file_mmap, .mmap = cifs_file_mmap,
.sendfile = generic_file_sendfile, .sendfile = generic_file_sendfile,
#ifdef CIFS_FCNTL
.fcntl = cifs_fcntl,
#endif
}; };
struct file_operations cifs_dir_ops = { struct file_operations cifs_dir_ops = {
.readdir = cifs_readdir, .readdir = cifs_readdir,
.release = cifs_closedir, .release = cifs_closedir,
.read = generic_read_dir, .read = generic_read_dir,
#ifdef CIFS_FCNTL
.fcntl = cifs_fcntl,
#endif
}; };
static void static void
......
...@@ -78,6 +78,7 @@ extern int cifs_file_mmap(struct file * , struct vm_area_struct *); ...@@ -78,6 +78,7 @@ extern int cifs_file_mmap(struct file * , struct vm_area_struct *);
extern struct file_operations cifs_dir_ops; extern struct file_operations cifs_dir_ops;
extern int cifs_dir_open(struct inode *inode, struct file *file); extern int cifs_dir_open(struct inode *inode, struct file *file);
extern int cifs_readdir(struct file *file, void *direntry, filldir_t filldir); extern int cifs_readdir(struct file *file, void *direntry, filldir_t filldir);
extern long cifs_fcntl(int, unsigned int, unsigned long, struct file *);
/* Functions related to dir entries */ /* Functions related to dir entries */
extern struct dentry_operations cifs_dentry_ops; extern struct dentry_operations cifs_dentry_ops;
......
/*
* fs/cifs/fcntl.c
*
* vfs operations that deal with the file control API
*
* Copyright (C) International Business Machines Corp., 2003,2004
* Author(s): Steve French (sfrench@us.ibm.com)
*
* This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
* by the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
* the GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <linux/fs.h>
#include <linux/stat.h>
#include <linux/fcntl.h>
#include "cifsglob.h"
#include "cifsproto.h"
#include "cifs_unicode.h"
#include "cifs_debug.h"
int cifs_directory_notify(unsigned long arg, struct file * file)
{
int xid;
int rc = -EINVAL;
struct cifs_sb_info *cifs_sb;
struct cifsTconInfo *pTcon;
char *full_path = NULL;
xid = GetXid();
cifs_sb = CIFS_SB(file->f_dentry->d_sb);
pTcon = cifs_sb->tcon;
full_path = build_path_from_dentry(file->f_dentry);
cFYI(1,("cifs dir notify on file %s",full_path));
/* CIFSSMBNotify */
FreeXid(xid);
return rc;
}
long cifs_fcntl(int file_desc, unsigned int command, unsigned long arg,
struct file * file)
{
/* Few few file control functions need to be specially mapped. So far
only:
F_NOTIFY (for directory change notification)
And eventually:
F_GETLEASE
F_SETLEASE
need to be mapped here. The others either already are mapped downstream
or do not need to go to the server (client only sideeffects):
F_DUPFD:
F_GETFD:
F_SETFD:
F_GETFL:
F_SETFL:
F_GETLK:
F_SETLK:
F_SETLKW:
F_GETOWN:
F_SETOWN:
F_GETSIG:
F_SETSIG:
*/
long rc = 0;
cFYI(1,("cifs_fcntl: command %d with arg %lx",command,arg)); /* BB removeme BB */
switch (command) {
case F_NOTIFY:
/* let the local call have a chance to fail first */
rc = generic_file_fcntl(file_desc,command,arg,file);
if(rc)
return rc;
else {
/* local call succeeded try to do remote notify to
pick up changes from other clients to server file */
cifs_directory_notify(arg, file);
/* BB add case to long and return rc from above */
return rc;
}
break;
default:
break;
}
return generic_file_fcntl(file_desc,command,arg,file);
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment