diff --git a/[refs] b/[refs] index d10be005d20c..523cce6d9ac0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0a4b92c05ed02ad7abdd165823eaf4bbcb33ae5c +refs/heads/master: 84153973a29dfb3f3d9fe2fe75c2cd613a3cdf27 diff --git a/trunk/fs/cifs/cifssmb.c b/trunk/fs/cifs/cifssmb.c index 20300bc9ae77..ca0f573e9791 100644 --- a/trunk/fs/cifs/cifssmb.c +++ b/trunk/fs/cifs/cifssmb.c @@ -2497,7 +2497,6 @@ CIFSGetExtAttr(const int xid, struct cifsTconInfo *tcon, /* Convert CIFS ACL to POSIX form */ static int parse_sec_desc(struct sec_desc * psec_desc, int acl_len) { - CHECK ON OTHER COMPUTER TO SEE IF FORMAT ENCODED IN CIFSPDU.H ALREADY return 0; }