Merge branch 'for-2.6.32' into for-2.6.33

[mv-sheeva.git] / fs / cifs / cifsacl.c

diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c
index 6941c22398a6ac4097528add80d3ebcbcad2bbc2..7dfe0842a6f6046ac590ebdb6b7762b6aad91315 100644 (file)
--- a/fs/cifs/cifsacl.c
+++ b/fs/cifs/cifsacl.c
@@ -607,7 +607,7 @@ static struct cifs_ntsd *get_cifs_acl(struct cifs_sb_info *cifs_sb,
                return get_cifs_acl_by_path(cifs_sb, path, pacllen);
 
        pntsd = get_cifs_acl_by_fid(cifs_sb, open_file->netfid, pacllen);
-       atomic_dec(&open_file->wrtPending);
+       cifsFileInfo_put(open_file);
        return pntsd;
 }
 
@@ -665,7 +665,7 @@ static int set_cifs_acl(struct cifs_ntsd *pnntsd, __u32 acllen,
                return set_cifs_acl_by_path(cifs_sb, path, pnntsd, acllen);
 
        rc = set_cifs_acl_by_fid(cifs_sb, open_file->netfid, pnntsd, acllen);
-       atomic_dec(&open_file->wrtPending);
+       cifsFileInfo_put(open_file);
        return rc;
 }