Merge to Fedora kernel-2.6.7-1.441

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

diff --git a/fs/cifs/fcntl.c b/fs/cifs/fcntl.c
index 39d7b89..1469a40 100644 (file)
--- a/fs/cifs/fcntl.c
+++ b/fs/cifs/fcntl.c
@@ -32,9 +32,12 @@ int cifs_directory_notify(unsigned long arg, struct file * file)
 {
        int xid;
        int rc = -EINVAL;
+       int oplock = FALSE;
        struct cifs_sb_info *cifs_sb;
        struct cifsTconInfo *pTcon;
        char *full_path = NULL;
+       __u32 filter = FILE_NOTIFY_CHANGE_NAME | FILE_NOTIFY_CHANGE_ATTRIBUTES;
+    __u16 netfid;
 
        xid = GetXid();
        cifs_sb = CIFS_SB(file->f_dentry->d_sb);
@@ -48,7 +51,20 @@ int cifs_directory_notify(unsigned long arg, struct file * file)
                rc = -ENOMEM;
        } else {
                cFYI(1,("cifs dir notify on file %s",full_path));
-               /* CIFSSMBNotify(xid, pTcon, full_path, cifs_sb->local_nls);*/
+               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) {
+                       cFYI(1,("Could not open directory for notify"));
+               } else {
+                       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 */
+               }
        }
        
        FreeXid(xid);