nfs: Move call to security_inode_listsecurity into nfs_listxattr

[linux-2.6-block.git] / fs / xattr.c

diff --git a/fs/xattr.c b/fs/xattr.c
index c3af6c9670cb6e3a833e19a2b300e3885c8a121b..2c7776403abaf9ad5a98c318ab7f33267e94329e 100644 (file)
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -723,6 +723,8 @@ generic_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size)
 
        if (!buffer) {
                for_each_xattr_handler(handlers, handler) {
+                       if (!handler->list)
+                               continue;
                        size += handler->list(handler, dentry, NULL, 0,
                                              NULL, 0);
                }
@@ -730,6 +732,8 @@ generic_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size)
                char *buf = buffer;
 
                for_each_xattr_handler(handlers, handler) {
+                       if (!handler->list)
+                               continue;
                        size = handler->list(handler, dentry, buf, buffer_size,
                                             NULL, 0);
                        if (size > buffer_size)