This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / fs / cifs / fcntl.c

diff --git a/fs/cifs/fcntl.c b/fs/cifs/fcntl.c
index 9babaf8..b908768 100644 (file)
--- a/fs/cifs/fcntl.c
+++ b/fs/cifs/fcntl.c
@@ -28,44 +28,6 @@
 #include "cifs_unicode.h"
 #include "cifs_debug.h"
 
-__u32 convert_to_cifs_notify_flags(unsigned long fcntl_notify_flags)
-{
-       __u32 cifs_ntfy_flags = 0;
-
-       /* No way on Linux VFS to ask to monitor xattr
-       changes (and no stream support either */
-       if(fcntl_notify_flags & DN_ACCESS) {
-               cifs_ntfy_flags |= FILE_NOTIFY_CHANGE_LAST_ACCESS;
-       }
-       if(fcntl_notify_flags & DN_MODIFY) {
-               /* What does this mean on directories? */
-               cifs_ntfy_flags |= FILE_NOTIFY_CHANGE_LAST_WRITE |
-                       FILE_NOTIFY_CHANGE_SIZE;
-       }
-       if(fcntl_notify_flags & DN_CREATE) {
-               cifs_ntfy_flags |= FILE_NOTIFY_CHANGE_CREATION | 
-                       FILE_NOTIFY_CHANGE_LAST_WRITE;
-       }
-       if(fcntl_notify_flags & DN_DELETE) {
-               cifs_ntfy_flags |= FILE_NOTIFY_CHANGE_LAST_WRITE;
-       }
-       if(fcntl_notify_flags & DN_RENAME) {
-               /* BB review this - checking various server behaviors */
-               cifs_ntfy_flags |= FILE_NOTIFY_CHANGE_DIR_NAME | 
-                       FILE_NOTIFY_CHANGE_FILE_NAME;
-       }
-       if(fcntl_notify_flags & DN_ATTRIB) {
-               cifs_ntfy_flags |= FILE_NOTIFY_CHANGE_SECURITY | 
-                       FILE_NOTIFY_CHANGE_ATTRIBUTES;
-       }
-/*     if(fcntl_notify_flags & DN_MULTISHOT) {
-               cifs_ntfy_flags |= ;
-       } */ /* BB fixme - not sure how to handle this with CIFS yet */
-
-
-       return cifs_ntfy_flags;
-}
-
 int cifs_dir_notify(struct file * file, unsigned long arg)
 {
        int xid;
@@ -75,7 +37,7 @@ int cifs_dir_notify(struct file * file, unsigned long arg)
        struct cifsTconInfo *pTcon;
        char *full_path = NULL;
        __u32 filter = FILE_NOTIFY_CHANGE_NAME | FILE_NOTIFY_CHANGE_ATTRIBUTES;
-       __u16 netfid;
+    __u16 netfid;
 
        xid = GetXid();
        cifs_sb = CIFS_SB(file->f_dentry->d_sb);
@@ -88,26 +50,20 @@ int cifs_dir_notify(struct file * file, unsigned long arg)
        if(full_path == NULL) {
                rc = -ENOMEM;
        } else {
-               cERROR(1,("cifs dir notify on file %s with arg 0x%lx",full_path,arg)); /* BB removeme BB */
+               cFYI(1,("cifs dir notify on file %s",full_path));
                rc = CIFSSMBOpen(xid, pTcon, full_path, FILE_OPEN, 
                        GENERIC_READ | SYNCHRONIZE, 0 /* create options */,
                        &netfid, &oplock,NULL, cifs_sb->local_nls);
                /* BB fixme - add this handle to a notify handle list */
                if(rc) {
-                       cERROR(1,("Could not open directory for notify"));  /* BB remove BB */
+                       cFYI(1,("Could not open directory for notify"));
                } else {
-                       filter = convert_to_cifs_notify_flags(arg);
-                       if(filter != 0) {
-                               rc = CIFSSMBNotify(xid, pTcon, 0 /* no subdirs */, netfid, 
-                                       filter, cifs_sb->local_nls);
-                       } else {
-                               rc = -EINVAL;
-                       }
+                       rc = CIFSSMBNotify(xid, pTcon, 1 /* subdirs */, netfid, 
+                               filter, cifs_sb->local_nls);
                        /* BB add code to close file eventually (at unmount
                        it would close automatically but may be a way
                        to do it easily when inode freed or when
                        notify info is cleared/changed */
-            cERROR(1,("notify rc %d",rc));
                }
        }